diff -urN zeroc-ice-3.6.2.1/setup.py zeroc-ice-3.6.2.1-fixed/setup.py
--- zeroc-ice-3.6.2.1/setup.py	2016-04-28 16:38:21.000000000 +0100
+++ zeroc-ice-3.6.2.1-fixed/setup.py	2016-08-18 12:29:16.830902000 +0100
@@ -18,6 +18,8 @@
     platform = 'darwin'
 elif platform[:5] == 'linux':
     platform = 'linux'
+elif platform[:7] == 'freebsd':
+    platform = 'freebsd'
 
 use_ice = False
 if "--with-installed-ice" in sys.argv:
@@ -63,8 +65,30 @@
             return False # Don't compile the bzip2 source under darwin or linux.
         return True
 
-elif platform == 'linux':
+elif platform == 'win32':
+    extra_link_args = []
+    libraries=[]
+    define_macros.append(('WIN32_LEAN_AND_MEAN', None))
+    define_macros.append(('ICE_BUILDING_ICE_UTIL', None))
+    define_macros.append(('ICE_BUILDING_SLICE', None))
+    define_macros.append(('ICE_BUILDING_ICE', None))
+    define_macros.append(('ICE_BUILDING_ICE_SSL', None))
+    define_macros.append(('_WIN32_WINNT', '0x601'))
+    include_dirs.append('src/ice/bzip2')
+    extra_compile_args.append('/EHsc')
+    extra_compile_args.append('/wd4250')
+    extra_compile_args.append('/wd4251')
+    extra_compile_args.append('/wd4275')
+    extra_compile_args.append('/wd4996')
+    libraries=['dbghelp', 'Shlwapi', 'rpcrt4','advapi32','Iphlpapi','secur32','crypt32','ws2_32']
+    # SysLoggerI.cpp shouldn't be built under Windows.
+    def filterName(path):
+        b = os.path.basename(path)
+        if b == 'SysLoggerI.cpp':
+            return False
+        return True
 
+else:
     #
     # TODO: Get rid of this hack to remove -Wstrict-prototypes from the compiler options
     # when http://bugs.python.org/issue1222585 is fixed. Note that this hack doesn't work
@@ -79,7 +103,9 @@
     if use_ice:
         libraries = ["IceSSL", "Ice", "Slice", "IceUtil"]
     else:
-        libraries=['ssl', 'crypto', 'bz2', 'rt', 'dl']
+        libraries=['ssl', 'crypto', 'bz2', 'rt']
+        if platform is not 'freebsd':
+            libraries.append('dl')
 
     def filterName(path):
         d = os.path.dirname(path)
@@ -89,28 +115,6 @@
             return False # Don't compile the bzip2 source under darwin or linux.
         return True
 
-elif platform == 'win32':
-    extra_link_args = []
-    libraries=[]
-    define_macros.append(('WIN32_LEAN_AND_MEAN', None))
-    define_macros.append(('ICE_BUILDING_ICE_UTIL', None))
-    define_macros.append(('ICE_BUILDING_SLICE', None))
-    define_macros.append(('ICE_BUILDING_ICE', None))
-    define_macros.append(('ICE_BUILDING_ICE_SSL', None))
-    define_macros.append(('_WIN32_WINNT', '0x601'))
-    include_dirs.append('src/ice/bzip2')
-    extra_compile_args.append('/EHsc')
-    extra_compile_args.append('/wd4250')
-    extra_compile_args.append('/wd4251')
-    extra_compile_args.append('/wd4275')
-    extra_compile_args.append('/wd4996')
-    libraries=['dbghelp', 'Shlwapi', 'rpcrt4','advapi32','Iphlpapi','secur32','crypt32','ws2_32']
-    # SysLoggerI.cpp shouldn't be built under Windows.
-    def filterName(path):
-        b = os.path.basename(path)
-        if b == 'SysLoggerI.cpp':
-            return False
-        return True
 
 # Gather the list of sources to compile.
 sources = []
diff -urN zeroc-ice-3.6.2.1/src/ice/cpp/include/IceUtil/IconvStringConverter.h zeroc-ice-3.6.2.1-fixed/src/ice/cpp/include/IceUtil/IconvStringConverter.h
--- zeroc-ice-3.6.2.1/src/ice/cpp/include/IceUtil/IconvStringConverter.h	2016-04-28 16:37:48.000000000 +0100
+++ zeroc-ice-3.6.2.1-fixed/src/ice/cpp/include/IceUtil/IconvStringConverter.h	2016-08-18 12:00:04.898681000 +0100
@@ -18,7 +18,7 @@
 #include <langinfo.h>
 #include <string.h> // For strerror
 
-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
     //
     // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
     //