diff --git a/volume_key-0.3.3-off_t.patch b/volume_key-0.3.3-off_t.patch
new file mode 100644
index 0000000..98a84dc
--- /dev/null
+++ b/volume_key-0.3.3-off_t.patch
@@ -0,0 +1,20 @@
+2010-07-22  Miloslav Trmač  <mitr@redhat.com>
+
+	* configure.ac: Use AC_SYS_LARGEFILE, required by gpgme.
+
+diff --git a/configure.ac b/configure.ac
+index e39ce62..7d8220e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,8 @@ AC_DEFINE([GETTEXT_PACKAGE], ["volume_key"], [Package name for <gi18n-lib.h>])
+ # Checks for library functions.
+ 
+ # Checks for system services.
++dnl We don't use off_t, but gpgme requires this.
++AC_SYS_LARGEFILE
+ 
+ # Miscellaneous hackery.
+ 
+-- 
+1.7.1.1
+
diff --git a/volume_key.spec b/volume_key.spec
index 5dd2bf2..071fed0 100644
--- a/volume_key.spec
+++ b/volume_key.spec
@@ -3,15 +3,19 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
 Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.xz
+# Upstream commit 6c31fc813c5329b343a44822eb04ef27f07b3367
+Patch0: volume_key-0.3.3-off_t.patch
 BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
 BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
+# For patch0
+BuildRequires: autoconf automake gettext-autopoint libtool
 
 %description
 This package provides a command-line tool for manipulating storage volume
@@ -73,6 +77,8 @@ for other formats is possible, some formats are planned for future releases.
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -fis
 
 %build
 %configure
@@ -113,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Thu Jul 22 2010 Miloslav Trmač <mitr@redhat.com> - 0.3.3-3
+- Fix build with new gpgme
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild