diff -Nru zoneminder-1.24.2/debian/changelog zoneminder-1.24.2/debian/changelog
--- zoneminder-1.24.2/debian/changelog	2010-09-17 13:24:47.000000000 -0500
+++ zoneminder-1.24.2/debian/changelog	2010-10-06 22:18:28.000000000 -0500
@@ -1,3 +1,10 @@
+zoneminder (1.24.2-7ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #656101)  Remaining changes:
+    - Add -D__STDC_CONSTANT_MACROS to fix FTBFS with ffmpeg 0.6
+
+ -- Micah Gersten <micahg@ubuntu.com>  Wed, 06 Oct 2010 22:18:10 -0500
+
 zoneminder (1.24.2-7) unstable; urgency=medium
 
   * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
@@ -17,6 +24,13 @@
 
  -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
 
+zoneminder (1.24.2-5ubuntu1) maverick; urgency=low
+
+  * Globally compile with preprocessor flags -D__STDC_CONSTANT_MACROS,
+    fixes FTBFS with ffmpeg 0.6 (LP: #609758)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 25 Jul 2010 18:33:54 +0530
+
 zoneminder (1.24.2-5) unstable; urgency=low
 
   [ Peter Howard ]
@@ -222,3 +236,4 @@
     various scripts; replaced with GPL.
 
  -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
+
diff -Nru zoneminder-1.24.2/debian/control zoneminder-1.24.2/debian/control
--- zoneminder-1.24.2/debian/control	2010-09-09 19:11:24.000000000 -0500
+++ zoneminder-1.24.2/debian/control	2010-09-21 19:36:30.000000000 -0500
@@ -1,7 +1,8 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Peter Howard <pjh@northern-ridge.com.au>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Peter Howard <pjh@northern-ridge.com.au>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 5), autoconf, automake, libphp-serialization-perl, libgnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg62-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
diff -Nru zoneminder-1.24.2/debian/rules zoneminder-1.24.2/debian/rules
--- zoneminder-1.24.2/debian/rules	2010-09-09 19:11:24.000000000 -0500
+++ zoneminder-1.24.2/debian/rules	2010-09-21 19:36:30.000000000 -0500
@@ -15,6 +15,7 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
+CPPFLAGS = -D__STDC_CONSTANT_MACROS
 CXXFLAGS = -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))