diff --git a/debian/changelog b/debian/changelog
index 53471d88c..12e820a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ cmake (2.8.7-3) UNRELEASED; urgency=low
   * Fix some tests not to fail if absolute build path contains regex
     metacharacters like +. This makes the package binNMUable again.
     (patch paths_in_regex_espace_metachars.diff)
+  * Drop support_cppflags.diff patch because this particular solution was
+    rejected by upstream. This reopens #653916.
 
  -- Modestas Vainius <modax@debian.org>  Sun, 26 Feb 2012 23:22:41 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 87fc2e24e..1bd211684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 FindBoost_add_-lpthread_#563479.diff
 multiarch_findgtk2_fix.diff
-support_cppflags.diff
 manpage_fixes.diff
 mipsel_is_little_endian.diff
 paths_in_regex_espace_metachars.diff
diff --git a/debian/patches/support_cppflags.diff b/debian/patches/support_cppflags.diff
deleted file mode 100644
index 561864e56..000000000
--- a/debian/patches/support_cppflags.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Modestas Vainius <modax@debian.org>
-Subject: Support CPPFLAGS environment variable
-Bug: http://www.cmake.org/Bug/view.php?id=12928
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916
-Forwarded: no
-Last-Update: 2012-02-18
-
-For now, append CPPFLAGS to CFLAGS and CXXFLAGS. In the perfect world, whenever
-C/C++ preprocessor is invoked, CPPFLAGS should be passed to it.
-
---- a/Modules/CMakeCInformation.cmake
-+++ b/Modules/CMakeCInformation.cmake
-@@ -102,7 +102,7 @@ IF(NOT CMAKE_MODULE_EXISTS)
-   SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
- ENDIF(NOT CMAKE_MODULE_EXISTS)
- 
--SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
-+SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} $ENV{CPPFLAGS} ${CMAKE_C_FLAGS_INIT}")
- # avoid just having a space as the initial value for the cache 
- IF(CMAKE_C_FLAGS_INIT STREQUAL " ")
-   SET(CMAKE_C_FLAGS_INIT)
---- a/Modules/CMakeCXXInformation.cmake
-+++ b/Modules/CMakeCXXInformation.cmake
-@@ -183,7 +183,7 @@ ENDFOREACH(type)
- # on the initial values computed in the platform/*.cmake files
- # use _INIT variables so that this only happens the first time
- # and you can set these flags in the cmake cache
--SET(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
-+SET(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} $ENV{CPPFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
- # avoid just having a space as the initial value for the cache 
- IF(CMAKE_CXX_FLAGS_INIT STREQUAL " ")
-   SET(CMAKE_CXX_FLAGS_INIT)