diff --git a/features/remote-poller/src/main/java/org/opennms/poller/remote/Main.java b/features/remote-poller/src/main/java/org/opennms/poller/remote/Main.java
index 0a2193e..e31440b 100644
--- a/features/remote-poller/src/main/java/org/opennms/poller/remote/Main.java
+++ b/features/remote-poller/src/main/java/org/opennms/poller/remote/Main.java
@@ -90,7 +90,11 @@ public class Main {
 
     private void initializeLogging() throws Exception {
         String logFile;
-        logFile = System.getProperty("poller.logfile", m_pollerHome + File.separator + "opennms-remote-poller.log");
+        //logFile = System.getProperty("poller.logfile", m_pollerHome + File.separator + "opennms-remote-poller.log");
+        logFile = System.getProperty("poller.logfile");
+	if (logFile == null) {
+		logFile = m_pollerHome + File.separator + "opennms-remote-poller.log";
+	}
         File logDirectory = new File(logFile).getParentFile();
         if (!logDirectory.exists()) {
             if (!logDirectory.mkdirs()) {