diff --git a/.SRCINFO b/.SRCINFO
index be124a1..addfb1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,24 @@
 pkgbase = sublime-text-3
 	pkgdesc = Sophisticated text editor for code, html and prose - stable build
 	pkgver = 3.3211
-	pkgrel = 2
+	pkgrel = 1
 	url = https://www.sublimetext.com/3
-	install = sublime-text-3.install
 	arch = x86_64
 	license = custom
 	depends = libpng
 	depends = gtk2
+	provides = sublime-text
+	conflicts = sublime-text-4-dev
+	conflicts = sublime-text-4
+	conflicts = sublime-text-3-imfix
+	conflicts = sublime-text-imfix
+	conflicts = sublime-text-nightly
+	conflicts = sublime-text-dev
+	conflicts = sublime-text2
+	replaces = sublime-text-3-imfix
 	source = https://download.sublimetext.com/sublime_text_3_build_3211_x64.tar.bz2
+	source = LICENSE
 	sha256sums = 0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+	sha256sums = 339dbd1b6ae3e699809afcdd6c690299e6fa0d385aa2ef658a52d336a3f8107f
 
 pkgname = sublime-text-3
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f39e2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/*.tar.bz2
+/*.pkg.tar.xz
+/pkg
+/src
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..981842a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,13 @@
+Maintainer note:
+Sublime Text is free to use, if you want access to the newer builds, with the package
+`sublime-text-4-dev` or `sublime-text-dev`, you'll need a paid license.
+
+Buying a license also supports the development of the editor.
+
+---
+
+Sublime Text may be downloaded and evaluated for free, however a license must be purchased for
+continued use. Licenses are per-user, rather than per-machine, so you can enjoy Sublime Text on as
+many computers and operating systems as you wish with your license.
+
+For more information, please visit https://www.sublimetext.com/buy
diff --git a/PKGBUILD b/PKGBUILD
index cede3fd..a3c3ca6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,54 @@
-# Maintainer: Manuel Hüsers <aur@huesers.de>
-# Contributor: marcospb19 <marcospb19@hotmail.com>
+# Maintainer: marcospb19 <marcospb19@hotmail.com>
 
 pkgname=sublime-text-3
 pkgver=3.3211
-pkgrel=2
+pkgrel=1
 pkgdesc="Sophisticated text editor for code, html and prose - stable build"
 arch=('x86_64')
 url='https://www.sublimetext.com/3'
 license=('custom')
 depends=('libpng' 'gtk2')
-install="${pkgname}.install"
-source=("https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2")
-sha256sums=('0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee')
+
+replaces=('sublime-text-3-imfix')
+
+conflicts=('sublime-text-4-dev'
+           'sublime-text-4'
+           'sublime-text-3-imfix'
+           'sublime-text-imfix'
+           'sublime-text-nightly'
+           'sublime-text-dev'
+           'sublime-text2')
+
+provides=('sublime-text')
+
+source=(
+    "https://download.sublimetext.com/sublime_text_3_build_${pkgver:2}_x64.tar.bz2"
+    'LICENSE'
+)
+sha256sums=('0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee'
+            '339dbd1b6ae3e699809afcdd6c690299e6fa0d385aa2ef658a52d336a3f8107f')
 
 package() {
-	cd "${srcdir}"
+    cd "${srcdir}"
 
-	# Adjust naming
-	sed -i 's#/opt/sublime_text/sublime_text#/opt/sublime_text_3/sublime_text#g' "sublime_text_3/sublime_text.desktop"
-	sed -i 's#Sublime Text#Sublime Text 3#g' "sublime_text_3/sublime_text.desktop"
-	sed -i 's#sublime-text#sublime-text-3#g' "sublime_text_3/sublime_text.desktop"
+    # Install sublime text 3
+    install -dm755 "${pkgdir}/opt"
+    cp --preserve=mode -r "sublime_text_3" "${pkgdir}/opt/sublime_text_3"
 
-	# Install sublime text 3
-	install -dm755 "${pkgdir}/opt"
-	cp --preserve=mode -r "sublime_text_3" "${pkgdir}/opt/sublime_text_3"
+    # Install icons
+    for res in 128x128 16x16 256x256 32x32 48x48; do
+        install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
+        ln -s "/opt/sublime_text_3/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text.png"
+    done
 
-	# Install icons
-	for res in 128x128 16x16 256x256 32x32 48x48; do
-		install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
-		ln -s "/opt/sublime_text_3/Icon/${res}/sublime-text.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/sublime-text-3.png"
-	done
+    # Install desktop entry and executable
+    install -dm755 "${pkgdir}/usr/share/applications"
+    install -Dm644 "sublime_text_3/sublime_text.desktop" "${pkgdir}/usr/share/applications/sublime_text.desktop"
+    sed -i 's#/opt/sublime_text/sublime_text#subl#g' "${pkgdir}/usr/share/applications/sublime_text.desktop"
+    install -dm755 "${pkgdir}/usr/bin"
+    ln -s "/opt/sublime_text_3/sublime_text" "${pkgdir}/usr/bin/subl"
 
-	# Install desktop entry and executable
-	sed -i 's#/opt/sublime_text_3/sublime_text#/usr/bin/subl3#g' "sublime_text_3/sublime_text.desktop"
-
-	install -dm755 "${pkgdir}/usr/share/applications"
-	install -Dm644 "sublime_text_3/sublime_text.desktop" "${pkgdir}/usr/share/applications/sublime_text_3.desktop"
-
-	install -dm755 "${pkgdir}/usr/bin"
-	ln -s "/opt/sublime_text_3/sublime_text" "${pkgdir}/usr/bin/subl3"
+    # Install license file
+    install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/sublime-text-3.install b/sublime-text-3.install
deleted file mode 100644
index 83f0138..0000000
--- a/sublime-text-3.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  cat << _EOF
-
-  ==> sublime-text-3 install note:
-  ------------------------------------------------------------------------------
-    Since this is the last version of Sublime Text 3, you might want to disable
-    in-application reminders about new Sublime Text versions (reportedly only
-    works as a licensed user).
-
-    Add the following setting to your User Preferences file:
-    "update_check": false
-
-_EOF
-}
-
-post_upgrade() {
-  post_install
-}