diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile
index 0545277086b4..2cd2cb17cba6 100644
--- a/system/skeleton/etc/profile
+++ b/system/skeleton/etc/profile
@@ -1,19 +1,8 @@
 export PATH=@PATH@
-
-if [ "$PS1" ]; then
-	if [ "`id -u`" -eq 0 ]; then
-		export PS1='# '
-	else
-		export PS1='$ '
-	fi
-fi
-
+export PS1='$(pwd)\$ '
 export EDITOR='/bin/vi'
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do
-	if [ -r "$i" ]; then
-		. $i
-	fi
-done
-unset i
+	[ -r "$i" ] && . $i
+done;unset i