diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 260820955..4cf220c4e 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch
+
 	# Only build the specified modules.
 	cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
 		$(DIR_APP)/mconfig
diff --git a/src/patches/xtables-addons-3.2-fix-database-generation.patch b/src/patches/xtables-addons-3.2-fix-database-generation.patch
new file mode 100644
index 000000000..5574e200d
--- /dev/null
+++ b/src/patches/xtables-addons-3.2-fix-database-generation.patch
@@ -0,0 +1,18 @@
+diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
+index 3b15875..7bc42f3 100755
+--- a/geoip/xt_geoip_build
++++ b/geoip/xt_geoip_build
+@@ -259,7 +259,12 @@ sub writeCountry
+ 		my ($start, $end) = split('-', $range);
+ 		$start = inet_pton($family, $start);
+ 		$end = inet_pton($family, $end);
+-		print $fh $start, $end;
++
++		if ($family == AF_INET) {
++			print $fh substr($start, 0, 4), substr($end, 0, 4);
++		} else {
++			print $fh $start, $end;
++		}
+ 	}
+ 	close $fh;
+ }