diff -Naur stg-2.408/include/stg/const.h stg-2.408-p1/include/stg/const.h
--- stg-2.408/include/stg/const.h	2012-02-09 12:26:53.000000000 +0200
+++ stg-2.408-p1/include/stg/const.h	2014-10-29 00:29:09.000000000 +0200
@@ -80,8 +80,6 @@
 #define NO_TARIFF_NAME  "*_NO_TARIFF_*"
 #define NO_CORP_NAME    "*_NO_CORP_*"
 
-#define mega (1024 * 1024)
-
 #define MONITOR_TIME_DELAY_SEC  (60)
 
 #endif
diff -Naur stg-2.408/projects/convertor/build stg-2.408-p1/projects/convertor/build
--- stg-2.408/projects/convertor/build	2012-02-09 12:26:57.000000000 +0200
+++ stg-2.408-p1/projects/convertor/build	2014-10-29 00:30:29.000000000 +0200
@@ -34,10 +34,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     MAKE="gmake"
 fi
diff -Naur stg-2.408/projects/rscriptd/build stg-2.408-p1/projects/rscriptd/build
--- stg-2.408/projects/rscriptd/build	2012-02-09 12:26:59.000000000 +0200
+++ stg-2.408-p1/projects/rscriptd/build	2014-10-29 00:31:06.000000000 +0200
@@ -46,10 +46,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     MAKE="gmake"
 fi
diff -Naur stg-2.408/projects/sgauth/build stg-2.408-p1/projects/sgauth/build
--- stg-2.408/projects/sgauth/build	2012-02-09 12:27:00.000000000 +0200
+++ stg-2.408-p1/projects/sgauth/build	2014-10-29 00:31:42.000000000 +0200
@@ -46,10 +46,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     MAKE="gmake"
 fi
diff -Naur stg-2.408/projects/sgconf/build stg-2.408-p1/projects/sgconf/build
--- stg-2.408/projects/sgconf/build	2012-02-09 12:27:03.000000000 +0200
+++ stg-2.408-p1/projects/sgconf/build	2014-10-29 00:32:15.000000000 +0200
@@ -46,10 +46,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     MAKE="gmake"
 fi
diff -Naur stg-2.408/projects/sgconf_xml/build stg-2.408-p1/projects/sgconf_xml/build
--- stg-2.408/projects/sgconf_xml/build	2012-02-09 12:27:04.000000000 +0200
+++ stg-2.408-p1/projects/sgconf_xml/build	2014-10-29 00:32:48.000000000 +0200
@@ -46,10 +46,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;	
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     MAKE="gmake"
 fi
diff -Naur stg-2.408/projects/stargazer/build stg-2.408-p1/projects/stargazer/build
--- stg-2.408/projects/stargazer/build	2012-02-09 12:27:05.000000000 +0200
+++ stg-2.408-p1/projects/stargazer/build	2014-10-29 00:24:49.000000000 +0200
@@ -68,10 +68,7 @@
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
-        7) OS=bsd7;;
-        8) OS=bsd7;;
-        9) OS=bsd7;;
-        *) OS=unknown;;
+        *) OS=bsd7;;
     esac
     ETC_DIR="./inst/freebsd/etc/stargazer"
     MAKE="gmake"
diff -Naur stg-2.408/stglibs/conffiles.lib/conffiles.cpp stg-2.408-p1/stglibs/conffiles.lib/conffiles.cpp
--- stg-2.408/stglibs/conffiles.lib/conffiles.cpp	2012-02-09 12:27:36.000000000 +0200
+++ stg-2.408-p1/stglibs/conffiles.lib/conffiles.cpp	2014-10-29 00:28:25.000000000 +0200
@@ -107,7 +107,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadString(const string & param, string * val, const string & defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -127,7 +127,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadTime(const string & param, time_t * val, time_t defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -147,7 +147,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadInt(const string & param, int * val, int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -167,7 +167,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadUInt(const string & param, unsigned int * val, unsigned int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -187,7 +187,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadLongInt(const string & param, long int * val, long int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -207,7 +207,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadULongInt(const string & param, unsigned long int * val, unsigned long int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -227,7 +227,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadLongLongInt(const string & param, int64_t * val, int64_t defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -247,7 +247,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadULongLongInt(const string & param, uint64_t * val, uint64_t defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -267,7 +267,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadShortInt(const string & param, short int * val, short int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -287,7 +287,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadUShortInt(const string & param, unsigned short int * val, unsigned short int defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -315,7 +315,7 @@
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadDouble(const string & param, double * val, double defaultVal) const
 {
-const map<string, string>::const_iterator it(param_val.find(param));
+const map<string, string, StringCaseCmp_t>::const_iterator it(param_val.find(param));
 
 if (it != param_val.end())
     {
@@ -350,7 +350,7 @@
     return EIO;
     }
 
-map<string, string>::const_iterator it = param_val.begin();
+map<string, string, StringCaseCmp_t>::const_iterator it = param_val.begin();
 while (it != param_val.end())
     {
     f << it->first << "=" << it->second << "\n";