diff --git a/install b/install
index 4674145..019d9d1 100755
--- a/install
+++ b/install
@@ -8,7 +8,9 @@ else
 	mkdir -p /usr/{bin,share/cdm}
 	install -m755 cdm /usr/bin/
 	install -Dm644 cdmrc /etc/cdmrc
-	cp -Rf skel themes /usr/share/cdm/
+	install -m644 xinitrc /usr/share/cdm/
+	install -Dm755 cdm-profile.sh /etc/profile.d/cdm-profile.sh
+	cp -Rf themes /usr/share/cdm/
 	echo "CDM configuration is done through /etc/cdmrc"
 	echo "Replace ~/.xinitrc and ~/.bash_profile with the files in /usr/share/cdm/skel for each user."
 fi
diff --git a/src/cdm-profile.sh b/src/cdm-profile.sh
new file mode 100755
index 0000000..6b1c464
--- /dev/null
+++ b/src/cdm-profile.sh
@@ -0,0 +1,6 @@
+. $HOME/.bashrc
+
+if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
+	cdm
+	exit
+fi