diff --git a/debian/postinst b/debian/postinst
index 70ccce1..59af2f0 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,7 +28,15 @@ case "$1" in
         fi
 
         if ! dpkg-statoverride --list /usr/bin/ceoquery > /dev/null; then
-            dpkg-statoverride --add --update $CEO $OFFICE $SUIDALL /usr/bin/ceoquery
+            dpkg-statoverride --add --update $CEO root $SUIDALL /usr/bin/ceoquery
+        fi
+
+        if ! dpkg-statoverride --list /usr/bin/csc-chsh > /dev/null; then
+            dpkg-statoverride --add --update $CEO root $SUIDALL /usr/bin/csc-chsh
+        fi
+
+        if ! dpkg-statoverride --list /usr/bin/csc-chfn > /dev/null; then
+            dpkg-statoverride --add --update $CEO root $SUIDALL /usr/bin/csc-chfn
         fi
 
         if [ -f /etc/csc/ldap.cf ] && ! dpkg-statoverride --list /etc/csc/ldap.cf > /dev/null; then
diff --git a/debian/postrm b/debian/postrm
index 9a6b87c..c49afc9 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -15,6 +15,14 @@ case "$1" in
             dpkg-statoverride --remove /usr/bin/ceoquery || true
         fi
 
+        if dpkg-statoverride --list /usr/bin/csc-chsh > /dev/null; then
+            dpkg-statoverride --remove /usr/bin/csc-chsh || true
+        fi
+
+        if dpkg-statoverride --list /usr/bin/csc-chfn > /dev/null; then
+            dpkg-statoverride --remove /usr/bin/csc-chfn || true
+        fi
+
         if dpkg-statoverride --list /etc/csc/ldap.cf > /dev/null; then
             dpkg-statoverride --remove /etc/csc/ldap.cf || true
         fi
diff --git a/debian/rules b/debian/rules
index eb7c520..8e65e61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ build-stamp:
 	$(CC) -DFULL_PATH='"/usr/lib/csc/ceo"' -o build/ceo misc/setuid-prog.c
 	$(CC) -DFULL_PATH='"/usr/lib/csc/addhomedir"' -o build/addhomedir misc/setuid-prog.c
 	$(CC) -DFULL_PATH='"/usr/lib/csc/ceoquery"' -o build/ceoquery misc/setuid-prog.c
+	$(CC) -DFULL_PATH='"/usr/lib/csc/csc-chfn"' -o build/csc-chfn misc/setuid-prog.c
+	$(CC) -DFULL_PATH='"/usr/lib/csc/csc-chsh"' -o build/csc-chsh misc/setuid-prog.c
 	touch build-stamp
 
 clean:
@@ -29,8 +31,8 @@ install: build
 	dh_install etc/* etc/csc/
 	dh_install sql/* usr/share/csc/
 	
-	dh_install bin/ceo bin/addhomedir bin/ceoquery usr/lib/csc/
-	dh_install build/ceo build/addhomedir build/ceoquery usr/bin/
+	dh_install bin/ceo bin/addhomedir bin/ceoquery bin/csc-chsh bin/csc-chfn usr/lib/csc/
+	dh_install build/ceo build/addhomedir build/ceoquery build/csc-chsh build/csc-chfn usr/bin/
 	
 binary-arch: build install
 	dh_testdir