diff --git a/ChangeLog b/ChangeLog
index 7a581b045..46d5c4bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-30 Julien Blache <jb@jblache.org>
+	* backend/xerox_mfp.conf.in, doc/descriptions/xerox_mfp.desc: add
+          Samsung SCX 4824 & 4825FN (Debian #601748).
+
 2010-10-13 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys_devices.c backend/genesys_gl843.c 
 	backend/genesys_gl843.h: added 100, 150, 400 and 600 dpi modes for
diff --git a/backend/xerox_mfp.conf.in b/backend/xerox_mfp.conf.in
index cdb5e6cb8..ffc4c4c0c 100644
--- a/backend/xerox_mfp.conf.in
+++ b/backend/xerox_mfp.conf.in
@@ -24,6 +24,9 @@ usb 0x04e8 0x3426
 # Samsung SCX-4500W
 usb 0x04e8 0x342b
 
+# Samsung SCX-4824
+usb 0x04e8 0x342c
+
 # Samsung SCX-4300
 usb 0x04e8 0x342e
 
@@ -36,6 +39,9 @@ usb 0x0924 0x4265
 #Samsung SCX-4623
 usb 0x04e8 0x3434
 
+# Samsung SCX-4825FN
+usb 0x04e8 0x343c
+
 #Xerox WorkCentre 4118 Series
 usb 0x0924 0x420c
 
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index e476666f7..52974a6b6 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -63,6 +63,11 @@
 :usbid "0x04e8" "0x342a"
 :status :good
 
+:model "SCX-4824"
+:interface "USB"
+:usbid "0x04e8" "0x342c"
+:status :good
+
 :model "SCX-4300"
 :interface "USB"
 :usbid "0x04e8" "0x342e"
@@ -78,6 +83,11 @@
 :usbid "0x04e8" "0x3434"
 :status :good
 
+:model "SCX-4825FN"
+:interface "USB"
+:usbid "0x04e8" "0x343c"
+:status :good
+
 :model "SCX-4500W"
 :interface "Ethernet"
 :status :basic