diff --git a/.gitignore b/.gitignore
index dbe8c37..1c986a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /libidn-1.??
-/libidn-1.36.tar.gz
+/libidn-1.37.tar.gz
diff --git a/libidn-1.33-Allow-disabling-Emacs-support.patch b/libidn-1.33-Allow-disabling-Emacs-support.patch
deleted file mode 100644
index 2c7189b..0000000
--- a/libidn-1.33-Allow-disabling-Emacs-support.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d011a6ae00ce9abd445d6d01ce9131a7b97ef5bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 3 Oct 2017 10:04:18 +0200
-Subject: [PATCH] Allow disabling Emacs support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch adds --disable-emacs configure option to disable installing
-LISP scripts for Emacs.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- configure.ac    | 9 ++++++++-
- src/Makefile.am | 2 ++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 649ddcd..a6dc9ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,7 +50,6 @@ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
- AM_GNU_GETTEXT(external)
- AM_GNU_GETTEXT_VERSION(0.19.3)
- AM_ICONV
--AM_PATH_LISPDIR
- 
- if test "$am_cv_func_iconv" != "yes"; then
-   AC_MSG_NOTICE([
-@@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no")
- AC_MSG_CHECKING([if implementation in Java should be built])
- AC_MSG_RESULT($enable_java)
- 
-+# Check for Emacs
-+AC_ARG_ENABLE(emacs, AC_HELP_STRING([--disable-emacs], [disable Emacs support]),
-+		enable_emacs=$enableval, enable_emacs=yes)
-+AM_CONDITIONAL(EMACS, test "$enable_emacs" != "no")
-+if test "$enable_emacs" != "no"; then
-+    AM_PATH_LISPDIR
-+fi
-+
- # Check for C#
- if test -n "$HAVE_CSHARPCOMP"; then
-   gt_CSHARPEXEC
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6832c20..ec99560 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,7 +20,9 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
- AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl
- AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
- 
-+if EMACS
- dist_lisp_DATA = punycode.el idna.el
-+endif
- 
- bin_PROGRAMS = idn
- idn_SOURCES = idn.c
--- 
-2.13.6
-
diff --git a/libidn-emacsopt.patch b/libidn-emacsopt.patch
new file mode 100644
index 0000000..c171815
--- /dev/null
+++ b/libidn-emacsopt.patch
@@ -0,0 +1,61 @@
+From d011a6ae00ce9abd445d6d01ce9131a7b97ef5bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 3 Oct 2017 10:04:18 +0200
+Subject: [PATCH] Allow disabling Emacs support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch adds --disable-emacs configure option to disable installing
+LISP scripts for Emacs.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ configure.ac    | 9 ++++++++-
+ src/Makefile.am | 2 ++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 649ddcd..a6dc9ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,6 @@ LT_INIT([win32-dll])
+ AM_MISSING_PROG(PERL, perl, $missing_dir)
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+ AM_ICONV
+-AM_PATH_LISPDIR
+ 
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.3])
+@@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no")
+ AC_MSG_CHECKING([if implementation in Java should be built])
+ AC_MSG_RESULT($enable_java)
+ 
++# Check for Emacs
++AC_ARG_ENABLE(emacs, AC_HELP_STRING([--disable-emacs], [disable Emacs support]),
++		enable_emacs=$enableval, enable_emacs=yes)
++AM_CONDITIONAL(EMACS, test "$enable_emacs" != "no")
++if test "$enable_emacs" != "no"; then
++    AM_PATH_LISPDIR
++fi
++
+ # Check for C#
+ if test -n "$HAVE_CSHARPCOMP"; then
+   gt_CSHARPEXEC
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6832c20..ec99560 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -20,7 +20,9 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl
+ AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
+ 
++if EMACS
+ dist_lisp_DATA = punycode.el idna.el
++endif
+ 
+ bin_PROGRAMS = idn
+ idn_SOURCES = idn.c
+-- 
+2.13.6
+
diff --git a/libidn.spec b/libidn.spec
index be735c9..fe71e74 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -5,13 +5,13 @@
 
 Summary: Internationalized Domain Name support library
 Name: libidn
-Version: 1.36
+Version: 1.37
 Release: 2%{?dist}
 URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+ and GPLv3+ and GFDL
 Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
 # Allow disabling Emacs support
-Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch
+Patch0: libidn-emacsopt.patch
 
 BuildRequires: autoconf autoconf-archive
 BuildRequires: automake
@@ -77,7 +77,7 @@ This package contains javadoc for %{name}-java.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .emacsopt
 autoreconf -vif
 # Prevent from regenerating sources by gengetopt because it's broken.
 touch src/idn_cmd.c src/idn_cmd.h
@@ -171,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
 %endif
 
 %files devel
-%doc doc/libidn.html examples
+%doc examples
 %{_libdir}/libidn.so
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
diff --git a/sources b/sources
index 8b3c430..d9e4477 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libidn-1.36.tar.gz) = 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad
+SHA512 (libidn-1.37.tar.gz) = 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c