diff --git a/CHANGELOG.md b/CHANGELOG.md
index e085ac4c..22040e31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Git LFS Changelog
 
+## 1.2.1 (2 June 2016)
+
+### Features
+
+* Add missing config details to `env` command #1217 (@sinbad)
+* Allow smudge filter to return 0 on download failure #1213 (@sinbad)
+* Add `git lfs update --manual` option & promote it on hook install fail #1182 (@sinbad)
+* Pass `git lfs clone` flags through to `git clone` correctly, respect some options #1160 (@sinbad)
+
+### Bugs
+
+* Clean trailing `/` from include/exclude paths #1278 (@ttaylorr)
+* Fix problems with user prompts in `git lfs clone` #1185 (@sinbad)
+* Fix failure to return non-zero exit code when lfs install/update fails to install hooks #1178 (@sinbad)
+* Fix missing man page #1149 (@javabrett)
+* fix concurrent map read and map write #1179 (@technoweenie)
+
+### Misc
+
+* Allow additional fields on request & response schema #1276 (@sinbad)
+* Fix installer error on win32. #1198 (@teo-tsirpanis)
+* Applied same -ldflags -X name value -> name=value fix #1193 (@javabrett)
+* add instructions to install from MacPorts #1186 (@skymoo)
+* Add xenial repo #1170 (@graingert)
+
 ## 1.2.0 (14 April 2016)
 
 ### Features
@@ -18,7 +43,7 @@
 * Fix silent failure to push LFS objects when ref matches a filename in the working copy #1096 (@epriestley)
 * Fix problems with using LFS in symlinked folders #818 (@sinbad)
 * Fix git lfs push silently misbehaving on ambiguous refs; fail like git push instead #1118 (@sinbad)
-* Whitelist lfs.*.access config in local ~/.lfsconfig #1122 (@rjbell4)
+* Whitelist `lfs.*.access` config in local ~/.lfsconfig #1122 (@rjbell4)
 * Only write the encoded pointer information to Stdout #1105 (@sschuberth)
 * Use hardcoded auth from remote or lfs config when accessing the storage api #1136 (@technoweenie, @jonmagic)
 * SSH should be called more strictly with command as one argument #1134 (@sinbad)
diff --git a/debian/changelog b/debian/changelog
index 8377e3b0..9f4c706e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-lfs (1.2.1) stable; urgency=low
+
+  * New upstream version
+
+ -- Stephen Gelman <gelman@getbraintree.com>  Thu, 2 Jun 2016 14:29:00 +0000
+
 git-lfs (1.2.0) stable; urgency=low
 
   * New upstream version
diff --git a/lfs/lfs.go b/lfs/lfs.go
index 6300e435..dd88aaac 100644
--- a/lfs/lfs.go
+++ b/lfs/lfs.go
@@ -14,6 +14,10 @@ import (
 	"github.com/rubyist/tracerx"
 )
 
+const (
+	Version = "1.2.1"
+)
+
 var (
 	LargeSizeThreshold = 5 * 1024 * 1024
 )
diff --git a/rpm/SPECS/git-lfs.spec b/rpm/SPECS/git-lfs.spec
index 9c3c4be0..c7998f1e 100644
--- a/rpm/SPECS/git-lfs.spec
+++ b/rpm/SPECS/git-lfs.spec
@@ -1,5 +1,5 @@
 Name:           git-lfs
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 
diff --git a/script/windows-installer/inno-setup-git-lfs-installer.iss b/script/windows-installer/inno-setup-git-lfs-installer.iss
index e4ea7b43..89604f2d 100644
--- a/script/windows-installer/inno-setup-git-lfs-installer.iss
+++ b/script/windows-installer/inno-setup-git-lfs-installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Git LFS"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.2.1"
 #define MyAppPublisher "GitHub, Inc"
 #define MyAppURL "https://git-lfs.github.com/"
 #define MyAppFilePrefix "git-lfs-windows"
@@ -56,12 +56,12 @@ var
   ExecStdOut: AnsiString;
   ResultCode: integer;
 
-begin      
+begin
   TmpFileName := ExpandConstant('{tmp}') + '\git_location.txt';
-  
+
   Exec(
     ExpandConstant('{cmd}'),
-    '/C "for %i in (git.exe) do @echo. %~$PATH:i > "' + TmpFileName + '"', 
+    '/C "for %i in (git.exe) do @echo. %~$PATH:i > "' + TmpFileName + '"',
     '', SW_HIDE, ewWaitUntilTerminated, ResultCode
   );
 
@@ -94,9 +94,9 @@ begin
   end;
   // look for the path with leading and trailing semicolon and with or without \ ending
   // Pos() returns 0 if not found
-  Result := Pos(';' + UpperCase(ParamExpanded) + ';', ';' + UpperCase(OrigPath) + ';') = 0;  
+  Result := Pos(';' + UpperCase(ParamExpanded) + ';', ';' + UpperCase(OrigPath) + ';') = 0;
   if Result = True then
-    Result := Pos(';' + UpperCase(ParamExpanded) + '\;', ';' + UpperCase(OrigPath) + ';') = 0; 
+    Result := Pos(';' + UpperCase(ParamExpanded) + '\;', ';' + UpperCase(OrigPath) + ';') = 0;
 end;
 
 // Runs the lfs initialization.
@@ -106,7 +106,7 @@ var
 begin
   Exec(
     ExpandConstant('{cmd}'),
-    ExpandConstant('/C ""{app}\git-lfs.exe" install"'), 
+    ExpandConstant('/C ""{app}\git-lfs.exe" install"'),
     '', SW_HIDE, ewWaitUntilTerminated, ResultCode
   );
   if not ResultCode = 1 then
@@ -122,9 +122,8 @@ var
 begin
   Exec(
     ExpandConstant('{cmd}'),
-    ExpandConstant('/C ""{app}\git-lfs.exe" uninstall"'), 
+    ExpandConstant('/C ""{app}\git-lfs.exe" uninstall"'),
     '', SW_HIDE, ewWaitUntilTerminated, ResultCode
   );
   Result := True;
 end;
-