diff -u norwegian-2.2/debian/aspell-no.install norwegian-2.2/debian/aspell-no.install
--- norwegian-2.2/debian/aspell-no.install
+++ norwegian-2.2/debian/aspell-no.install
@@ -9,0 +10,2 @@
+nb.cwl.gz /usr/share/aspell
+nn.cwl.gz /usr/share/aspell
diff -u norwegian-2.2/debian/changelog norwegian-2.2/debian/changelog
--- norwegian-2.2/debian/changelog
+++ norwegian-2.2/debian/changelog
@@ -1,3 +1,13 @@
+norwegian (2.2-4) unstable; urgency=medium
+
+  * Fix invocation of dh_auto_build to properly pass the right args.
+    Thanks to Chris Lamb for the patch.  Closes: #900290
+  * Bump debhelper compat to 11.
+  * Ship nb.cwl and nn.cwl files to make aspell/aspell-autobuildhash
+    happier.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 07 Jun 2018 21:43:54 +0200
+
 norwegian (2.2-3) unstable; urgency=medium
 
   * Fix up where the no{.{dat,multi},_phonet.dat} symlinks point.
diff -u norwegian-2.2/debian/compat norwegian-2.2/debian/compat
--- norwegian-2.2/debian/compat
+++ norwegian-2.2/debian/compat
@@ -1 +1 @@
-10
+11
diff -u norwegian-2.2/debian/rules norwegian-2.2/debian/rules
--- norwegian-2.2/debian/rules
+++ norwegian-2.2/debian/rules
@@ -5,10 +5,9 @@
 
 override_dh_auto_build: debian/po/en.po
 	chmod +x scripts/thes_to_dat
-	dh_auto_build
-
-override_dh_build:
-	$(MAKE) TH_NB1= TH_NN1= AWK=gawk
+	dh_auto_build -- TH_NB1= TH_NN1= AWK=gawk
+	cat words.nb | prezip -s -c | gzip -9n -c > nb.cwl.gz
+	cat words.nn | prezip -s -c | gzip -9n -c > nn.cwl.gz
 
 override_dh_install:
 	cd debian/tmp && \
@@ -40,0 +40,4 @@
+
+override_dh_clean:
+	rm -f nb.cwl.gz nn.cwl.gz
+	dh_clean