diff --git a/ChangeLog b/ChangeLog
index 03159f886..d09c9c0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/samba-get-config.py: new utility taking a samba
+	configuration variable and prints the value on stdout
+
 2012-07-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m
diff --git a/OpenChange/samba-get-config.py b/OpenChange/samba-get-config.py
new file mode 100755
index 000000000..c91c3ed44
--- /dev/null
+++ b/OpenChange/samba-get-config.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import sys
+import samba.param
+
+a = samba.param.LoadParm()
+a.load_default()
+print a.get(sys.argv[1])