diff --git a/.gitignore b/.gitignore
index 920134d..16695bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /password-store-1.4.tar.xz
 /password-store-1.4.1.tar.xz
 /password-store-1.5.tar.xz
+/password-store-1.6.1.tar.xz
diff --git a/0001-Install-bash-completion-file-to-the-right-place.patch b/0001-Install-bash-completion-file-to-the-right-place.patch
deleted file mode 100644
index d03ac2d..0000000
--- a/0001-Install-bash-completion-file-to-the-right-place.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 542d5568578c8a603833d135b2d5caf5f29781b0 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 14 Apr 2014 15:03:56 +0200
-Subject: [PATCH 1/2] Install bash-completion file to the right place.
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ff9b450..df9d68a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ install-pass:
- 	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
- 	@install -m 0755 -v src/password-store.sh "$(DESTDIR)$(BINDIR)/pass"
- 	@install -m 0644 -v man/pass.1 "$(DESTDIR)$(MANDIR)/man1/pass.1"
--	@install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store"
-+	@install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass"
- 
- #	Uncomment to install the zsh completion file.
- #	@install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
--- 
-1.9.0
-
diff --git a/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch b/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
deleted file mode 100644
index a95d016..0000000
--- a/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 775c305331a674ceb42c7a2e931e459a6b44b719 Mon Sep 17 00:00:00 2001
-From: schalox <schalox@gmail.com>
-Date: Sat, 19 Apr 2014 08:20:21 +0300
-Subject: [PATCH 2/2] bash-completion: fix completion-file's name in uninstall
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index df9d68a..f82b9cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,4 +33,4 @@ install: install-pass
- endif
- 
- uninstall:
--	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
-+	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
--- 
-1.9.0
-
diff --git a/pass.spec b/pass.spec
index 252b067..68d0db2 100644
--- a/pass.spec
+++ b/pass.spec
@@ -1,13 +1,11 @@
 Name:           pass
 Summary:        A password manager using standard Unix tools
-Version:        1.5
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 License:        GPLv2+
 Url:            http://zx2c4.com/projects/password-store/
 BuildArch:      noarch
 Source:         http://git.zx2c4.com/password-store/snapshot/password-store-%{version}.tar.xz
-Patch1:         0001-Install-bash-completion-file-to-the-right-place.patch
-Patch2:         0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
 
 Requires:       git
 Requires:       gnupg2
@@ -21,13 +19,12 @@ pwgen, and git.
 
 %prep
 %setup -q -n password-store-%{version}
-%patch1 -p1
-%patch2 -p1
+rm -f contrib/emacs/.gitignore
 
 %install
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
      BINDIR=%{_bindir} SYSCONFDIR=%{_sysconfdir} \
-     MANDIR=%{_mandir} \
+     MANDIR=%{_mandir} FORCE_ALL=1 \
      install
 install -d %{buildroot}%{_datadir}/zsh/site-functions/
 install -m 0644 src/completion/pass.zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_pass
@@ -43,6 +40,9 @@ install -m 0644 src/completion/pass.fish-completion %{buildroot}%{_datadir}/fish
 %doc %{_mandir}/man1/*
 
 %changelog
+* Fri Apr 25 2014 Christophe Fergeau <cfergeau@redhat.com> 1.6.1-1
+- Update to 1.6.1
+
 * Wed Apr 23 2014 Christophe Fergeau <cfergeau@redhat.com> 1.5-2
 - Fix location of bash completion files
 
diff --git a/sources b/sources
index bf8c834..4ec9cfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca094372e1eec8c857b2f6ace09fb723  password-store-1.5.tar.xz
+d970e0c5a0e4d1455e5bfb8926a4cc1c  password-store-1.6.1.tar.xz