diff -Nru openscad-2013.01+dfsg/debian/changelog openscad-2013.01+dfsg/debian/changelog
--- openscad-2013.01+dfsg/debian/changelog	2014-01-18 21:01:43.000000000 +0000
+++ openscad-2013.01+dfsg/debian/changelog	2014-01-25 19:40:16.000000000 +0000
@@ -1,3 +1,10 @@
+openscad (2013.01+dfsg-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix for bad boost libraries. (Closes: #736544)
+
+ -- Anton Gladky <gladk@debian.org>  Fri, 24 Jan 2014 20:12:03 +0100
+
 openscad (2013.01+dfsg-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru openscad-2013.01+dfsg/debian/patches/fix_bad_boost_libs.patch openscad-2013.01+dfsg/debian/patches/fix_bad_boost_libs.patch
--- openscad-2013.01+dfsg/debian/patches/fix_bad_boost_libs.patch	1970-01-01 00:00:00.000000000 +0000
+++ openscad-2013.01+dfsg/debian/patches/fix_bad_boost_libs.patch	2014-01-24 18:48:00.000000000 +0000
@@ -0,0 +1,42 @@
+Description: Fix for bad boost libraries
+Author: Brody Kenrick <user.fake@server.userfake>
+Acked-By: Anton Gladky <gladk@debian.org>
+Applied-Upstream: https://github.com/brodykenrick/openscad/commit/d3b82dcac0cbd6bb46c3236d1183f84b76b44748
+Last-Update: 2014-01-24
+
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -359,6 +359,33 @@
+ endif()
+ inclusion(CGAL_DIR CGAL_INCLUDE_DIRS)
+ 
++#Get rid of bad libraries suggested for BOOST dependencies (they don't exist on some machines and cause build failures).
++#/usr/lib/libboost_thread.so;/usr/lib/libboost_system.so;
++string(FIND "${CGAL_3RD_PARTY_LIBRARIES}" "/usr/lib/libboost_system.so" FIND_POSITION  )
++if(NOT "-1" STREQUAL ${FIND_POSITION} )
++if(NOT EXISTS "/usr/lib/libboost_system.so")
++  MESSAGE( WARNING "CGAL_3RD_PARTY_LIBRARIES:Found erroneous /usr/lib/libboost_system.so -- stripping" )
++  string(REPLACE "/usr/lib/libboost_system.so" "" CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES})
++endif()
++endif() 
++string(FIND "${CGAL_3RD_PARTY_LIBRARIES}" "/usr/lib/libboost_thread.so" FIND_POSITION  )
++if(NOT "-1" STREQUAL ${FIND_POSITION} )
++if(NOT EXISTS "/usr/lib/libboost_thread.so")
++  MESSAGE( WARNING "CGAL_3RD_PARTY_LIBRARIES:Found erroneous /usr/lib/libboost_thread.so -- stripping" )
++  string(REPLACE "/usr/lib/libboost_thread.so" "" CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES})
++endif()
++endif() 
++
++if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "")
++  # Force pkg-config to look _only_ in the local library folder
++  # in case OPENSCAD_LIBRARIES is set.
++  set(ENV{PKG_CONFIG_PATH} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
++  set(ENV{PKG_CONFIG_LIBDIR} "$ENV{OPENSCAD_LIBRARIES}/lib/pkgconfig")
++endif()
++
++# Find libraries (system installed or dependency built) using pkg-config
++find_package(PkgConfig REQUIRED)
++
+ # Imagemagick
+ 
+ if (NOT SKIP_IMAGEMAGICK)
diff -Nru openscad-2013.01+dfsg/debian/patches/series openscad-2013.01+dfsg/debian/patches/series
--- openscad-2013.01+dfsg/debian/patches/series	2013-02-23 15:24:01.000000000 +0000
+++ openscad-2013.01+dfsg/debian/patches/series	2014-01-24 18:37:36.000000000 +0000
@@ -1 +1,2 @@
 debian-changes
+fix_bad_boost_libs.patch