diff --git a/.gitignore b/.gitignore
index 2db39a1..5df48ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ pinentry-0.8.0.tar.gz.sig
 /pinentry-0.9.2.tar.bz2.sig
 /pinentry-0.9.5.tar.bz2
 /pinentry-0.9.5.tar.bz2.sig
+/pinentry-0.9.6.tar.bz2
+/pinentry-0.9.6.tar.bz2.sig
diff --git a/pinentry.spec b/pinentry.spec
index a97260b..b3b6029 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -1,6 +1,6 @@
 
 Name:    pinentry
-Version: 0.9.5
+Version: 0.9.6
 Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
@@ -82,7 +82,8 @@ CXXFLAGS="%{optflags} -std=c++11"
   --disable-dependency-tracking \
   --without-libcap \
   --enable-pinentry-gtk2 \
-  --enable-pinentry-qt4
+  --enable-pinentry-qt4 \
+  --enable-pinentry-emacs
 
 make %{?_smp_mflags}
 
@@ -92,7 +93,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
 ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
-ln -s pinentry-qt4 $RPM_BUILD_ROOT%{_bindir}/pinentry-qt
+# This changed in 0.9.6
+ln -s pinentry-qt $RPM_BUILD_ROOT%{_bindir}/pinentry-qt4
 
 install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
 
@@ -137,6 +139,11 @@ fi
 %{_bindir}/pinentry-emacs
 
 %changelog
+* Fri Sep 11 2015 Boris Ranto <branto@redhat.com> - 0.9.6-1
+- Rebase to latest upstream version
+- Modify backwards compatible symlink for qt(4)
+- Enable pinentry-emacs since it was enabled by default in 0.9.5
+
 * Thu Jul 02 2015 Boris Ranto <branto@redhat.com> - 0.9.5-1
 - Rebase to latest upstream version
 - Removing qt4 pinentry patch -- got merged upstream
diff --git a/sources b/sources
index 87a645b..65184d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-55439c4436b59573a29e144916ee5b61  pinentry-0.9.5.tar.bz2
-863139929ce5eeebe98d5c433bc82577  pinentry-0.9.5.tar.bz2.sig
+ab27ee5f9c3079842a9becd7ef7605cc  pinentry-0.9.6.tar.bz2
+6b91c6b76e03c64ec284ab9b1508e4f5  pinentry-0.9.6.tar.bz2.sig