diff --git a/lib/setup.php b/lib/setup.php
index f87581d758..04a65d0126 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -224,7 +224,9 @@ class OC_Setup {
 				OC_Installer::installShippedApps(true);
 
 				//create htaccess files for apache hosts
-				self::createHtaccess(); //TODO detect if apache is used
+				if (strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+					self::createHtaccess();
+				}
 
 				//and we are done
 				OC_Config::setValue('installed', true);