diff --git a/makeanything.sh b/makeanything.sh
index fe8f34c..cf90a91 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -123,12 +123,17 @@ message "putting generated icon path list to /etc/jwm/system.jwmrc"
 $CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc || error
 
 message "correct file permissions"
-$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
+#$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
 $CHROOTCMD /usr/bin/chmod 755 /root/nanodesk-installer.sh || error
+$CHROOTCMD /usr/bin/chmod 755 /usr/bin/jwm-nanodesk || error
 
 message "set x-terminal-emulator to lxterminal"
 $CHROOTCMD /usr/bin/update-alternatives --set x-terminal-emulator /usr/bin/lxterminal
 
+message "set x-window-manager to jwm-nanodesk"
+$CHROOTCMD /usr/bin/update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/jwm-nanodesk 25
+$CHROOTCMD /usr/bin/update-alternatives --set x-window-manager /usr/bin/jwm-nanodesk
+
 ### set root password
 #message "set root password to 'debian'"
 #echo -e "debian\ndebian" | $CHROOTCMD /usr/bin/passwd root
diff --git a/nanodesk-files/etc/sudoers b/nanodesk-files/etc/sudoers
deleted file mode 100644
index 2e23d75..0000000
--- a/nanodesk-files/etc/sudoers
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# Please consider adding local content in /etc/sudoers.d/ instead of
-# directly modifying this file.
-#
-# See the man page for details on how to write a sudoers file.
-#
-Defaults	env_reset
-Defaults	mail_badpass
-Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-# Host alias specification
-
-# User alias specification
-debian	ALL=(ALL) NOPASSWD: ALL
-# Cmnd alias specification
-
-# User privilege specification
-root	ALL=(ALL:ALL) ALL
-
-# Allow members of group sudo to execute any command
-%sudo	ALL=(ALL:ALL) ALL
-
-# See sudoers(5) for more information on "@include" directives:
-
-@includedir /etc/sudoers.d
diff --git a/nanodesk-files/usr/bin/jwm-nanodesk b/nanodesk-files/usr/bin/jwm-nanodesk
new file mode 100755
index 0000000..261f90d
--- /dev/null
+++ b/nanodesk-files/usr/bin/jwm-nanodesk
@@ -0,0 +1,2 @@
+#!/bin/sh
+jwm -f /etc/jwm/system.nanodesk.jwmrc
diff --git a/nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop b/nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop
new file mode 100644
index 0000000..bfbc56c
--- /dev/null
+++ b/nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Jwm
+Comment=Minimalistic pure X11 window manager with menu/tray support
+Type=Application
+Terminal=False
+Exec=/usr/bin/jwm -f /etc/jwm/system.nanodesk.jwmrc
+TryExec=jwm
+Icon=/usr/share/jwm/jwm-red.svg
+Keywords=X11;floating;windowmanager;
+
+[Window Manager]
+SessionManaged=true