diff --git a/RTCP/Storage/src/Storage.log_prop b/RTCP/Storage/src/Storage.log_prop
index 5cdbc0381748cee48c178f0b0b43ddf89bf8339d..1a616ec8e04498f6d2f0696cbc7ea6fcc05d360b 100644
--- a/RTCP/Storage/src/Storage.log_prop
+++ b/RTCP/Storage/src/Storage.log_prop
@@ -1,16 +1,24 @@
 
 # Configure the loggers
-log4cplus.rootLogger=INFO, STDOUT
-#log4cplus.logger.TRC=INFO
+log4cplus.rootLogger=DEBUG, STDOUT
 log4cplus.logger.TRC=INFO
-log4cplus.logger.LCS.Common=FATAL, STDOUT
+#log4cplus.logger.LCS.Common=FATAL, STDOUT
 
 # Define the appenders
 log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
 log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
+log4cplus.appender.STDOUT.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %m%n
 
-log4cplus.appender.STDERR=log4cplus::ConsoleAppender
-log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.STDERR.logToStdErr=true
+#log4cplus.appender.STDERR=log4cplus::ConsoleAppender
+#log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
+#log4cplus.appender.STDERR.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+#log4cplus.appender.STDERR.logToStdErr=true
+
+#log4cplus.appender.FILE=log4cplus::RollingFileAppender
+#log4cplus.appender.FILE.File=${LOG4CPLUS_LOGFILENAME}.log
+#log4cplus.appender.FILE.MaxFileSize=10MB
+#log4cplus.appender.FILE.MaxBackupIndex=2
+#log4cplus.appender.FILE.layout=log4cplus::PatternLayout
+#log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+
+log4cplus.appender.DUMP=log4cplus::NullAppender
diff --git a/RTCP/Storage/src/Storage_main.cc b/RTCP/Storage/src/Storage_main.cc
index 9d99509553780e2dfe8dae3df4e8943e420f3f53..2ed7e37084105d378808a6dec0e49fa858363aa0 100644
--- a/RTCP/Storage/src/Storage_main.cc
+++ b/RTCP/Storage/src/Storage_main.cc
@@ -147,18 +147,9 @@ int main(int argc, char *argv[])
   string logPrefix = "[obs unknown] ";
 
 #if defined HAVE_LOG4CPLUS
-  using namespace log4cplus;
-  using namespace log4cplus::helpers;
-
-  helpers::Properties traceProp;
-  traceProp.setProperty("log4cplus.rootLogger", "DEBUG, STDOUT");
-  traceProp.setProperty("log4cplus.logger.TRC", "DEBUG");
-  traceProp.setProperty("log4cplus.appender.STDOUT", "log4cplus::ConsoleAppender");
-  traceProp.setProperty("log4cplus.appender.STDOUT.layout", "log4cplus::PatternLayout");
-  traceProp.setProperty("log4cplus.appender.STDOUT.layout.ConversionPattern", "%x %D{%d-%m-%y %H:%M:%S} %-5p %n");
-  
-  PropertyConfigurator(traceProp).configure();
+  INIT_LOGGER( "Storage" );
 #elif defined HAVE_LOG4CXX
+  #error LOG4CXX support is broken (nonsensical?) -- please fix this code if you want to use it
   Context::initialize();
   setLevel("Global",8);
 #else