diff --git a/bin/cdist-config b/bin/cdist-config
index bebf449c..850f2a2b 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -63,8 +63,8 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_type_bin:=type_bin}
 : ${__cdist_name_type_explorer:=type_explorer}
 
-# Used for IDs
-: ${__cdist_sane_regexp:=[A-Za-z0-9/]*[-A-Za-z0-9_/]*}
+# Used for IDs: Allow everything not starting with - and .
+: ${__cdist_sane_regexp:=^[^-\.]}
 
 # Default remote user
 : ${__cdist_remote_user:=root}
diff --git a/doc/changelog b/doc/changelog
index 4ec2c47f..41073e2c 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,3 +1,6 @@
+1.0.3: upcoming
+	* Update regexp used for sane characters
+
 1.0.2: 2011-03-09
 	* Add manpages: cdist-type, cdist-type__file, cdist-reference, cdist-explorer
 	* Make doc/man/ usable as MANPATH entry