diff --git a/debian/changelog b/debian/changelog
index 5dcc3b6d511e8abacf462f4b8a05285d984aead0..855c1c1b35a8ff767f25a017ab5bebbb50c2614f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-srb2 (2.1.21~3) trusty; urgency=high
+srb2 (2.1.21~9) trusty; urgency=high
 
-  * Pre-release for SRB2 v2.1.21
+  * SRB2 v2.1.21 release
 
- -- Marco Zafra <marco.a.zafra@gmail.com>  Mon, 26 Nov 2018 09:03:00 -0500
+ -- Marco Zafra <marco.a.zafra@gmail.com>  Mon, 27 Nov 2018 16:45:00 -0500
 
 
 srb2 (2.0.6-5) maverick; urgency=high
diff --git a/debian/control b/debian/control
index a341cabed1df302d4b7792362850c639d060c362..ce3b33fbdae1efb642b80591d8920436f18f0a9f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Maintainer: Sonic Team Junior <stjr@srb2.org>
 Build-Depends: debhelper (>= 7.0.50~),
  libsdl2-dev,
  libsdl2-mixer-dev,
- libpng12-dev (>= 1.2.7) | libpng-dev (>= 1.2.7),
+ libpng12-dev (>= 1.2.7) | libpng-dev,
  zlib1g-dev,
  libgme-dev,
  libglu1-dev | libglu-dev,
diff --git a/debian/rules b/debian/rules
index 4526a60bfaee9ca06676cc3448891fa3393ace13..02e3dc78ece7f4579f974ec22542f8661b10cde7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,15 +64,17 @@ DESKTOP_DIR = usr/share/applications
 PREFIX	= $(shell test "$(CROSS_COMPILE_BUILD)" != "$(CROSS_COMPILE_HOST)" && echo "PREFIX=$(CROSS_COMPILE_HOST)")
 OS	= LINUX=1
 NONX86	= $(shell test "`echo $(CROSS_COMPILE_HOST) | grep 'i[3-6]86'`" || echo "NONX86=1")
-MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng NOOBJDUMP=1
+MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) NOOBJDUMP=1 # SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng
 MENUFILE1 = ?package($(PACKAGE)):needs="X11" section="$(SECTION)"
 MENUFILE2 = title="$(TITLE)" command="/$(PKGDIR)/$(PACKAGE)"
-# FIXME pkg-config dir hacks
-export PKG_CONFIG_LIBDIR = /usr/lib/$(CROSS_COMPILE_HOST)/pkgconfig
 BINDIR :=  $(DIR)/bin/Linux/Release
+
+# FIXME pkg-config dir hacks
+# Launchpad doesn't need this; it actually makes i386 builds fail due to cross-compile
+# export PKG_CONFIG_LIBDIR = /usr/lib/$(CROSS_COMPILE_HOST)/pkgconfig
 LDFLAGS += "-Wl,-rpath=/usr/lib/$(CROSS_COMPILE_HOST)"
 
-# FIXME some libgme-dev packages don't use pkg-config yet, so include the linker flag ourselves
+# Some libgme-dev packages don't use pkg-config yet, so include the linker flag ourselves
 PKG_CONFIG?=pkg-config
 LIBGME_PKGCONFIG?=libgme
 LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)