diff --git a/Makefile b/Makefile
index e7822d97..25e835e7 100644
--- a/Makefile
+++ b/Makefile
@@ -415,12 +415,7 @@ install-base: all
 	$(INSTALL) -m0644 doc/chibi-doc.1 $(DESTDIR)$(MANDIR)/
 	-if type $(LDCONFIG) >/dev/null 2>/dev/null; then $(LDCONFIG) >/dev/null 2>/dev/null; fi
 
-install-bash-completion:
-	if [ -d "/etc/bash_completion.d" ]; then \
-			cp tools/snow-chibi-completion.bash /etc/bash_completion.d/snow-chibi; \
-		fi
-
-install: install-base install-bash-completion
+install: install-base
 ifneq "$(IMAGE_FILES)" ""
 	echo "Generating images"
 	-[ -z "$(DESTDIR)" ] && LD_LIBRARY_PATH="$(SOLIBDIR):$(LD_LIBRARY_PATH)" DYLD_LIBRARY_PATH="$(SOLIBDIR):$(DYLD_LIBRARY_PATH)" CHIBI_MODULE_PATH="$(MODDIR):$(BINMODDIR)" $(BINDIR)/chibi-scheme$(EXE) -mchibi.repl -d $(MODDIR)/chibi.img
diff --git a/lib/chibi/snow/commands.scm b/lib/chibi/snow/commands.scm
index 1f73cbac..efbfbf5b 100644
--- a/lib/chibi/snow/commands.scm
+++ b/lib/chibi/snow/commands.scm
@@ -1372,9 +1372,10 @@
                                    char-whitespace?)))))
        (list (or dir "/usr/local/share/cyclone/"))))
     ((generic)
-     (list (make-path (string-append (or (conf-get cfg 'install-prefix)
-                                         "/usr/local")
-                                     "/lib/snow"))))
+     (list (make-path (or (conf-get cfg 'install-prefix)
+                          (cond-expand (windows (get-environment-variable "LOCALAPPDATA"))
+                                       (else "/usr/local"))
+                          "/lib/snow"))))
     ((gauche)
      (list
       (let ((dir (string-trim