diff --git a/libs/djvu/djvu.py b/libs/djvu/djvu.py
--- a/libs/djvu/djvu.py
+++ b/libs/djvu/djvu.py
@@ -7,10 +7,11 @@
             self.targets[ver] = 'http://downloads.sourceforge.net/djvu/djvulibre-' + ver + '.tar.gz'
             self.targetInstSrc[ver] = 'djvulibre-' + ver
         self.targetInstSrc['3.5.25.3'] = 'djvulibre-3.5.25'
-        self.patchToApply['3.5.21'] = [("djvu-cmake.diff", 0)]
-        self.patchToApply['3.5.23'] = [("djvulibre-3.5.23-20101116.diff", 1)]
-        self.patchToApply['3.5.25.3'] = [("djvulibre-3.5.25.3-20130906.diff", 1)]
-        self.patchToApply['3.5.27'] = [("djvulibre-3.5.27-20151208.diff", 1)]
+        if OsUtils.isWin():
+            self.patchToApply['3.5.21'] = [("djvu-cmake.diff", 0)]
+            self.patchToApply['3.5.23'] = [("djvulibre-3.5.23-20101116.diff", 1)]
+            self.patchToApply['3.5.25.3'] = [("djvulibre-3.5.25.3-20130906.diff", 1)]
+            self.patchToApply['3.5.27'] = [("djvulibre-3.5.27-20151208.diff", 1)]
         self.targetDigests['3.5.23'] = 'b19f6b461515a52eb1048aec81e04dfd836d681f'
         self.targetDigests['3.5.25.3'] = 'ad35056aabb1950f385360ff59520a82a6f779ec'
         self.targetDigests['3.5.27'] = '99c4f2c621c063bf8c8a1626030539fe5a8675f9'
@@ -21,11 +22,28 @@
     def setDependencies(self):
         self.runtimeDependencies["virtual/base"] = "default"
 
-
 from Package.CMakePackageBase import *
+from Package.AutoToolsPackageBase import *
+
+
+class PackageAutoTools(AutoToolsPackageBase):
+    def __init__(self, **args):
+        AutoToolsPackageBase.__init__(self)
+        self.subinfo.options.configure.args = " --enable-shared "
+        if CraftCore.compiler.isMacOS:
+            # attempting to build and install the png files will fail on MacOS
+            self.subinfo.options.configure.args += " --disable-desktopfiles "
+
 
 
-class Package(CMakePackageBase):
+class PackageCMake(CMakePackageBase):
     def __init__(self, **args):
         CMakePackageBase.__init__(self)
         self.subinfo.options.configure.args = "-DBUILD_TOOLS=OFF"
+
+if CraftCore.compiler.isWindows:
+    class Package(PackageCMake):
+        pass
+else:
+    class Package(PackageAutoTools):
+        pass
diff --git a/libs/djvu/djvulibre-3.5.27-20151208.diff b/libs/djvu/djvulibre-3.5.27-20151208.diff
--- a/libs/djvu/djvulibre-3.5.27-20151208.diff
+++ b/libs/djvu/djvulibre-3.5.27-20151208.diff
@@ -32,9 +32,15 @@
 +    add_definitions(-Wno-deprecated)
 +endif(MINGW)
 +
-+if(MINGW)
++if(MINGW OR UNIX)
 +    add_definitions(-DHAVE_STDINT_H=1)
 +endif(MINGW)
++if (UNIX)
++    add_definitions(-DHAVE_PTHREAD=1 -DUNIX=1 -DHAVE_STDINCLUDES=1 -DHAS_WCHAR=1)
++endif()
++if (APPLE)
++    add_definitions(-DHAVE_MBSTATE_T=1 -std=c++11)
++endif()
 +# ******************************************************************************
 +# cmake handles the runtimeDependencies itself
 +add_subdirectory(libdjvu)
@@ -180,8 +186,8 @@
  umin(unsigned char a, unsigned char b) 
  { return (a>b) ? b : a; }
  
-+#if !defined(_MSC_VER) || _MSC_VER < 1600
- inline float 
++#if !defined(__APPLE__) && (!defined(_MSC_VER) || _MSC_VER < 1600)
+ inline float
  fmin(float a, float b) 
  { return (a>b) ? b : a; }
 -