diff --git a/win32/nsi/firefly.log b/win32/nsi/firefly.log
new file mode 100644
index 00000000..c44c15fa
--- /dev/null
+++ b/win32/nsi/firefly.log
@@ -0,0 +1 @@
+# Firefly Log File
diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index 7f9f7df3..cd15b5a4 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -246,6 +246,10 @@ NoProgramItems:
   File "mapping.ini"
 
 HasMap:
+  IfFileExists "$2\firefly.log" HasLog
+  File "firefly.log"
+  
+HasLog:
   File "mt-daapd-example.conf" 
   IfFileExists "$2\mt-daapd.conf" HasConf
   SetOverwrite off
@@ -288,6 +292,7 @@ HasConf:
   WriteINIStr "$2\mt-daapd.conf" "general" "db_type" "sqlite3"
   AccessControl::SetOnFile "$2\mt-daapd.conf" "Everyone" "FullAccess"
   AccessControl::SetOnFile "$2\mapping.ini" "Everyone" "FullAccess"
+  AccessControl::SetOnFile "$2\firefly.log" "Everyone" "FullAccess"
   SetAutoClose False
 SectionEnd
 
@@ -324,12 +329,14 @@ Section -Post
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$2\mt-daapd.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$2\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$2\mt-daapd.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$2\firefly.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
   
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
+  WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
+  DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" 
+
 ;  ExecWait "$2\mt-daapd.exe -i"
 
   nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" ""