diff -u bfm-0.6.4/Makefile bfm-0.6.4/Makefile
--- bfm-0.6.4/Makefile
+++ bfm-0.6.4/Makefile
@@ -32,6 +32,7 @@
 GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
 GTK2_LIBS = -lX11 $(shell pkg-config gtk+-2.0 --libs)
 
+LIBS += -lm
 
 # optimization cflags
 #CFLAGS = -O3 -Wall ${EXTRA}
@@ -79,14 +80,14 @@
 ifeq ($(OS), FreeBSD)
 	SRCS += sys_freebsd.c
     OBJS += sys_freebsd.o
-    LIBS = -lkvm
+    LIBS += -lkvm
     INSTALL = -c -g kmem -m 2755 -o root
 endif
 
 # special things for OpenBSD
 ifeq ($(OS), OpenBSD)
     OBJS += sys_openbsd.o
-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+    LIBS += `gtk-config --libs | sed "s/-lgtk//g"`
 endif
 
 #special things for SunOS
@@ -109,7 +110,7 @@
     CFLAGS += ${EXTRA}
 	SRCS += sys_sunos.c
     OBJS += sys_sunos.o
-    LIBS = -lkstat -lm
+    LIBS += -lkstat
     INSTALL = -m 755
 endif
 
@@ -129,12 +130,12 @@
 
 bubblefishymon: clean_obj
 	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
-		$(SRCS) $(LIBS) $(GTK2_LIBS) -lm
+		$(SRCS) $(LIBS) $(GTK2_LIBS)
 	$(STRIP) $(BUBBLEFISHYMON)
 
 bubblefishymon1: clean_obj
 	$(CC) $(GTK_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
-		$(SRCS) $(LIBS) $(GTK_LIBS) -lm
+		$(SRCS) $(LIBS) $(GTK_LIBS)
 	$(STRIP) $(BUBBLEFISHYMON)
 
 clean_obj:
diff -u bfm-0.6.4/debian/control bfm-0.6.4/debian/control
--- bfm-0.6.4/debian/control
+++ bfm-0.6.4/debian/control
@@ -1,8 +1,7 @@
 Source: bfm
 Section: x11
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Mika Matsuzaki <mika@yukidoke.org>
+Maintainer: Mika Matsuzaki <mika@yukidoke.org>
 Uploaders: Ola Lundqvist <opal@debian.org>
 Build-Depends: debhelper (>= 5), gkrellm, libgtk2.0-dev
 Standards-Version: 3.9.3
diff -u bfm-0.6.4/debian/changelog bfm-0.6.4/debian/changelog
--- bfm-0.6.4/debian/changelog
+++ bfm-0.6.4/debian/changelog
@@ -1,15 +1,11 @@
-bfm (0.6.4-5ubuntu2) raring; urgency=low
+bfm (0.6.4-5.1) unstable; urgency=low
 
-  * Added missing math lib to link, fixing FTBFS.
+  * Non-maintainer upload.
+  * Specifically link libm. (Closes: #713602).
+  * Fix ordering of libraries. (Closes: #616727).
+    + Thanks to Dave Walker for the fix.
 
- -- Daniel T Chen <crimsun@ubuntu.com>  Fri, 05 Apr 2013 20:23:28 -0400
-
-bfm (0.6.4-5ubuntu1) quantal; urgency=low
-
-  * Merge from Debian testing.  Remaining changes:
-    - Changed order of libraries in order to fix FTBFS. (Closes: #616727)
-
- -- Angel Abad <angelabad@ubuntu.com>  Thu, 20 Sep 2012 12:50:28 +0200
+ -- Barry deFreese <bdefreese@debian.org>  Sun, 07 Jul 2013 04:02:09 -0400
 
 bfm (0.6.4-5) unstable; urgency=low
 
@@ -19,12 +15,6 @@
 
  -- Mika Matsuzaki <mika@yukidoke.org>  Tue, 03 Apr 2012 23:56:02 -0400
 
-bfm (0.6.4-4ubuntu1) natty; urgency=low
-
-  * Changed order of libraries in order to fix FTBFS. (LP: #730214) 
-
- -- Tarun Kumar Mall <c2tarun@gmail.com>  Sun, 06 Mar 2011 17:22:41 +0000
-
 bfm (0.6.4-4) unstable; urgency=low
 
   * Fixed nostrip build option. (Closes: #436580)