diff --git a/bandwidth/config-mandrake-linux b/bandwidth/config-mandrake-linux
new file mode 100644
index 000000000..eac20cb4d
--- /dev/null
+++ b/bandwidth/config-mandrake-linux
@@ -0,0 +1 @@
+bandwidth_log=/var/log/syslog
diff --git a/bind8/config-mandrake-linux b/bind8/config-mandrake-linux
index 3a07a8620..c27a25eda 100644
--- a/bind8/config-mandrake-linux
+++ b/bind8/config-mandrake-linux
@@ -1,3 +1,4 @@
+pid_file=/var/run/named/named.pid
 soa_style=0
 named_path=/usr/sbin/named
 named_conf=/etc/named.conf
diff --git a/config-mandrake-linux b/config-mandrake-linux
index 962fac8be..014038270 100644
--- a/config-mandrake-linux
+++ b/config-mandrake-linux
@@ -8,3 +8,4 @@ passwd_cindex=2
 passwd_mindex=4
 by_view=0
 tempdelete_days=7
+charset=UTF-8
diff --git a/os_list.txt b/os_list.txt
index 58326d2be..333f88610 100644
--- a/os_list.txt
+++ b/os_list.txt
@@ -128,10 +128,17 @@ Mandrake Linux			6.1	redhat-linux	6.0	$etc_issue =~ /Mandrake\s+release\s+6\.1/i
 Mandrake Linux			7.0	redhat-linux	6.1	$etc_issue =~ /Mandrake\s+release\s+7\.0/i
 Mandrake Linux			7.1	redhat-linux	6.2	$etc_issue =~ /Mandrake\s+release\s+7\.1/i
 Mandrake Linux			$1	mandrake-linux	$1	`cat /etc/mandrake-release 2>/dev/null` =~ /Mandrake.*?([0-9\.]+)/i || $etc_issue =~ /Mandrake\s+release\s+([0-9\.]+)/i || $etc_issue =~ /Mandrakelinux\s+release\s+([0-9\.]+)/i
+
+# Mandriva Linux
 Mandriva Linux			$2	mandrake-linux	10.2	$etc_issue =~ /(Mandrakelinux|Mandriva).*(2006\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i
 Mandriva Linux			$2	mandrake-linux	10.3	$etc_issue =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i
 Mandriva Linux			$2	mandrake-linux	10.4	$etc_issue =~ /(Mandrakelinux|Mandriva).*(2008\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2008\.\d+)/i
 Mandriva Linux			$2	mandrake-linux	10.5	$etc_issue =~ /(Mandrakelinux|Mandriva).*(2009\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2009\.\d+)/i
+Mandriva Linux			$2	mandrake-linux	$2	$etc_issue =~ /(Mandriva).*(20\d\d\.\d+)/i || `cat /etc/mandriva-release 2>/dev/null` =~ /(Mandriva).*(20\d\d\.\d+)/i
+
+# Mandriva Corporate
+Mandrake Linux Corporate Server	$i	mandrake-linux	$i	$etc_issue =~ /Mandrake\s+Linux\s+Corporate\s+Server\s+release\s+([0-9\.]+)/i
+Mandriva Linux Enterprise Server	5.0	mandrake-linux	2009	$etc_issue =~ /Mandriva\s+Linux\s+Enterprise\s+Server\s+release\s+5\.0\s+\(Official\)\s+for\s+(i586|x86_64)/i
 
 # Conectiva Linux (now subsumed into Mandrake?)
 Conectiva Linux			3.0	redhat-linux	5.2	$etc_issue =~ /Conectiva.*Linux.*3\.0/i
diff --git a/samba/config-mandrake-linux b/samba/config-mandrake-linux
index 72bd66009..c604a152f 100644
--- a/samba/config-mandrake-linux
+++ b/samba/config-mandrake-linux
@@ -5,7 +5,7 @@ samba_password_program=/usr/bin/smbpasswd
 samba_status_program=/usr/bin/smbstatus
 samba_server=/usr/sbin/smbd
 name_server=/usr/sbin/nmbd
-smb_conf=/etc/smb.conf
+smb_conf=/etc/smb/smb.conf
 text_lists=0
 run_from_inetd=0
 swat_path=/usr/sbin/swat
diff --git a/sarg/config-mandrake-linux b/sarg/config-mandrake-linux
new file mode 100644
index 000000000..e572a9730
--- /dev/null
+++ b/sarg/config-mandrake-linux
@@ -0,0 +1,4 @@
+sarg=sarg
+sarg_conf=/etc/sarg/sarg.conf
+clear=1
+naked=0
diff --git a/sendmail/config-mandrake-linux b/sendmail/config-mandrake-linux
index 9b684ebcb..01df62790 100644
--- a/sendmail/config-mandrake-linux
+++ b/sendmail/config-mandrake-linux
@@ -1,4 +1,4 @@
-sendmail_cf=/etc/sendmail.cf
+sendmail_cf=/etc/mail/sendmail.cf
 sendmail_pid=/var/run/sendmail.pid
 makemap_path=makemap
 sendmail_command=/etc/rc.d/init.d/sendmail start
@@ -20,6 +20,7 @@ sendmail_mc=/etc/mail/sendmail.mc
 mail_style=0
 mailq_show=Date,From,To,Size,Status
 index_min=1000000
+queue_dirs=/var/spool/clientmqueue
 fwd_mode=0
 mailq_sort=0
 mailq_count=0
diff --git a/useradmin/config-mandrake-linux b/useradmin/config-mandrake-linux
index f3b7441f1..87de33212 100644
--- a/useradmin/config-mandrake-linux
+++ b/useradmin/config-mandrake-linux
@@ -27,7 +27,7 @@ email_type=0
 home_base=/home
 new_user_gid=0
 delete_root=0
-md5=1
+md5=2
 uid_mode=1
 gid_mode=1
 gid_calc=0