diff -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog
--- libidn-1.33/debian/changelog	2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/changelog	2017-12-17 00:04:41.000000000 +0100
@@ -1,3 +1,15 @@
+libidn (1.33-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not use help2man when cross-building (Closes: #875684)
+  * Update list of active maintainers
+    - Remove Anibal Monsalve Salazar
+
+  [ Helmut Grohne ]
+  * Move java dependencies to Build-Depends-Indep (Closes: #870669)
+
+ -- Manuel A. Fernandez Montecelo <address@hidden>  Sun, 17 Dec 2017 00:04:41 +0100
+
 libidn (1.33-2) unstable; urgency=high
 
   * CVE-2017-14062: Fix integer overflow in decode_digit (Closes: #873903)
diff -Nru libidn-1.33/debian/control libidn-1.33/debian/control
--- libidn-1.33/debian/control	2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/control	2017-12-16 23:00:02.000000000 +0100
@@ -2,9 +2,10 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Libidn Team <address@hidden>
-Uploaders: Anibal Monsalve Salazar <address@hidden>, Simon Josefsson <address@hidden>, Ondřej Surý <address@hidden>
+Uploaders: Simon Josefsson <address@hidden>, Ondřej Surý <address@hidden>
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), gcj-jdk [!arm !hppa !hurd-i386 !mips64el], fastjar [!arm !hppa !hurd-i386 !mips64el], dh-autoreconf, autopoint (>= 0.19.3), help2man, texinfo
+Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint (>= 0.19.3), help2man, texinfo
+Build-Depends-Indep: gcj-jdk, fastjar
 Homepage: https://www.gnu.org/software/libidn/
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libidn.git
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libidn.git
diff -Nru libidn-1.33/debian/rules libidn-1.33/debian/rules
--- libidn-1.33/debian/rules	2017-09-12 11:18:33.000000000 +0200
+++ libidn-1.33/debian/rules	2017-12-16 22:55:13.000000000 +0100
@@ -4,16 +4,16 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-# Don't build libidn11-java on platforms that doesn't have gcj.
-NO_JAVA_ARCHES := arm hppa hurd-i386 mips64el or1k
-DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-  # Or when bootstrapping, because libidn is needed before gcj, see #738147.
-  export DH_OPTIONS=-Nlibidn11-java
-else ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_JAVA_ARCHES)))
-  ENABLE_JAVA := --enable-java
+DOPACKAGES = $(shell dh_listpackages)
+CONFIGURE_FLAGS :=
+ifneq ($(filter libidn11-java,$(DOPACKAGES)),)
+CONFIGURE_FLAGS += --enable-java
 else
-  export DH_OPTIONS=-Nlibidn11-java
+CONFIGURE_FLAGS += --disable-java
+endif
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export HELP2MAN=true
 endif
 
 %:
@@ -26,7 +26,7 @@
 		--with-packager-version=$(CFG_VERS) \
 		--with-packager-bug-reports=https://bugs.debian.org/ \
 		--disable-silent-rules \
-		 $(ENABLE_JAVA)
+		$(CONFIGURE_FLAGS)
 
 override_dh_auto_install:
 	dh_auto_install
@@ -40,3 +40,7 @@
 override_dh_install:
 	dh_install
 	rm -f debian/libidn11-java/usr/share/doc/libidn11-java/api/package-list
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	mkdir -p debian/tmp/usr/share/man/man1/
+	cp -fv doc/idn.1 debian/tmp/usr/share/man/man1/idn.1
+endif