diff --git a/cdist/conf/type/__rvm_gem/gencode-remote b/cdist/conf/type/__rvm_gem/gencode-remote
index 0b855fc0..3aef45ef 100755
--- a/cdist/conf/type/__rvm_gem/gencode-remote
+++ b/cdist/conf/type/__rvm_gem/gencode-remote
@@ -32,14 +32,12 @@ state_should="$(cat "$__object/parameter/state")"
 case "$state_should" in
     present)
         cat << DONE
-su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
-rvm use $gemset; gem install $gem"
+su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm; rvm use $gemset; gem install $gem"\"
 DONE
     ;;
     absent)
         cat << DONE
-su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
-rvm use $gemset; gem uninstall $gem"
+su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm; rvm use $gemset; gem uninstall $gem"\"
 DONE
     ;;
 esac
diff --git a/docs/changelog b/docs/changelog
index f848d83c..a2c78210 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -7,7 +7,8 @@ Changelog
 2.1.0pre6:
 	* New Example: Turn remote calls into local calls (used for unittesting)
 	* Core: Export PYTHONPATH, it's also needed by emulator
-	* Type __rvm_ruby: Add clean package dependencies
+	* Bugfix Type __rvm_ruby: Add clean package dependencies
+	* Bugfix Type __rvm_gem: Run rvm as user, not as root
 
 2.1.0pre5: 2012-11-01
 	* Core: First round of tests updated to work with multiple configuration directories