diff --git a/lib/private/preview.php b/lib/private/preview.php
index cc15ab84fe7..086d9c0272a 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -24,6 +24,7 @@ require_once 'preview/svg.php';
 require_once 'preview/txt.php';
 require_once 'preview/unknown.php';
 require_once 'preview/office.php';
+require_once 'preview/tiff.php';
 
 class Preview {
 	//the thumbnail folder
diff --git a/lib/private/preview/tiff.php b/lib/private/preview/tiff.php
new file mode 100644
index 00000000000..c435ec71352
--- /dev/null
+++ b/lib/private/preview/tiff.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+use Imagick;
+
+if (extension_loaded('imagick')) {
+
+        $checkImagick = new Imagick();
+
+        if(count($checkImagick->queryFormats('TIFF')) === 1) {
+
+                class TIFF extends Provider {
+
+                        public function getMimeType() {
+                                return '/image\/tiff/';
+                        }
+
+                        public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+                                $tmpPath = $fileview->toTmpFile($path);
+
+                                //create imagick object from TIFF
+                                try{
+                                        $tiff = new Imagick($tmpPath);
+                                        $tiff->setImageFormat('png');
+                                } catch (\Exception $e) {
+                                        \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+                                        return false;
+                                }
+
+                                unlink($tmpPath);
+
+                                //new image object
+                                $image = new \OC_Image($tiff);
+                                //check if image object is valid
+                                return $image->valid() ? $image : false;
+                        }
+
+                }
+
+                \OC\Preview::registerProvider('OC\Preview\TIFF');
+        }
+}