diff --git a/.SRCINFO b/.SRCINFO
index f8f6c2bb6cba..c53dd6dd30a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = mcpatcher
 	pkgdesc = Minecraft patcher to fix textures with higher than default resolution
-	pkgver = 4.2.0
-	pkgrel = 2
+	pkgver = 4.2.1
+	pkgrel = 1
 	url = https://bitbucket.org/prupe/mcpatcher
 	changelog = ChangeLog
 	arch = any
 	license = Public Domain
 	depends = java-runtime
 	optdepends = minecraft: the game itself
-	noextract = mcpatcher-4.2.0.jar
-	source = https://bitbucket.org/prupe/mcpatcher/downloads/mcpatcher-4.2.0.jar
+	noextract = mcpatcher-4.2.1.jar
+	source = https://bitbucket.org/prupe/mcpatcher/downloads/mcpatcher-4.2.1.jar
 	source = mcpatcher
 	source = mcpatcher.desktop
-	md5sums = 552cc0ea875032a5e15c395debdc8869
+	md5sums = 0a040cb24f503042801bd65a85f0c926
 	md5sums = 9ec7aafefe59c2864b70f61d8661113d
 	md5sums = 5bcaba0e9fbc3a22159c17a64c7688fd
 
diff --git a/ChangeLog b/ChangeLog
index 3c04519909d3..98d77aea3d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
 2013-08-11 Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
-	* 4.2.0-2
+	* 4.2.1-1
+	Version bump.
 	Moved .jar file to /usr/share/java/mcpatcher/
 
+	Upstream changelog:
+	- Fixed problem preventing choosing a custom minecraft installation directory.
+	- More "hands-off" Forge installation method that also supports LiteLoader.
+	- Use system proxy settings for all downloads.
+	- Use shorter timeout when downloading versions.json and use bundled copy as a fallback.
+	- Option to use HD font spacing with non-HD fonts.
+	- Do not use default CIT texture if any texture.* properties are set.
+	- Treat bare filenames without leading / as relative to properties file.
+	- Pattern and regex based NBT rules in CIT.
+
 2013-08-01 Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
 	* 4.2.0-1
diff --git a/PKGBUILD b/PKGBUILD
index ea1b56b0dc4b..e1c988603351 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
 pkgname=mcpatcher
-pkgver='4.2.0'
-pkgrel=2
+pkgver='4.2.1'
+pkgrel=1
 pkgdesc='Minecraft patcher to fix textures with higher than default resolution'
 arch=('any')
 license=('Public Domain')
@@ -15,7 +15,7 @@ changelog=ChangeLog
 source=(https://bitbucket.org/prupe/mcpatcher/downloads/$pkgname-$pkgver.jar
         mcpatcher
         mcpatcher.desktop)
-md5sums=('552cc0ea875032a5e15c395debdc8869'
+md5sums=('0a040cb24f503042801bd65a85f0c926'
          '9ec7aafefe59c2864b70f61d8661113d'
          '5bcaba0e9fbc3a22159c17a64c7688fd')