diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index c52a1fa253080750e72d3c8b29ad04fdf094c72e..a2cda4de46d755619bdf7172f278d3cafc215b14 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.588 2006/10/30 22:35:28 pjwilliams Exp $
+$Id: CHANGELOG,v 1.589 2006/11/11 17:50:50 ballen4705 Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -33,6 +33,10 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [BA] Increased max line length MAXLINELEN for /etc/smartd.conf from
+       128 to 256 characters to handle long strings in
+       /dev/disk/by-id.  Thanks to Martin Krafft.
+
   [PW] Drive database: added missing drives from Seagate Momentus 5400.2
        family
 
diff --git a/sm5/smartd.h b/sm5/smartd.h
index 563a2c1723d0e98a26502c4aa5bc88afd52233e9..1ac23e396fc44b093935a5ca290f7ffaba27327b 100644
--- a/sm5/smartd.h
+++ b/sm5/smartd.h
@@ -32,7 +32,7 @@
 
 
 #ifndef SMARTD_H_CVSID
-#define SMARTD_H_CVSID "$Id: smartd.h,v 1.83 2006/09/15 08:01:21 sxzzsf Exp $\n"
+#define SMARTD_H_CVSID "$Id: smartd.h,v 1.84 2006/11/11 17:50:50 ballen4705 Exp $\n"
 #endif
 
 // Configuration file
@@ -42,7 +42,7 @@
 #define SCANDIRECTIVE "DEVICESCAN"
 
 // maximum line length in configuration file
-#define MAXLINELEN 128
+#define MAXLINELEN 256
 
 // maximum length of a continued line in configuration file
 #define MAXCONTLINE 1023