diff --git a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
index bbffabe..f7c0dc6 100644
--- a/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
+++ b/src/main/java/info/fetter/logstashforwarder/FileWatcher.java
@@ -48,7 +48,8 @@ public class FileWatcher {
 	private boolean stdinConfigured = false;
 	private String sincedbFile = null;
 
-	public FileWatcher() {
+	public FileWatcher(String sincedbFileName) {
+		sincedbFile = sincedbFileName;
 		try {
 			logger.debug("Loading saved states");
 			savedStates = Registrar.readStateFromJson(sincedbFile);
@@ -363,9 +364,4 @@ public class FileWatcher {
 	public void setTail(boolean tail) {
 		this.tail = tail;
 	}
-
-	public void setSincedb(String sincedbFile) {
-		this.sincedbFile = sincedbFile;	
-	}
-
 }
diff --git a/src/main/java/info/fetter/logstashforwarder/Forwarder.java b/src/main/java/info/fetter/logstashforwarder/Forwarder.java
index dc52bbb..7dab3ae 100644
--- a/src/main/java/info/fetter/logstashforwarder/Forwarder.java
+++ b/src/main/java/info/fetter/logstashforwarder/Forwarder.java
@@ -72,10 +72,9 @@ public class Forwarder {
 		try {
 			parseOptions(args);
 			setupLogging();
-			watcher = new FileWatcher();
+			watcher = new FileWatcher(sincedbFile);
 			watcher.setMaxSignatureLength(signatureLength);
 			watcher.setTail(tailSelected);
-			watcher.setSincedb(sincedbFile);
 			configManager = new ConfigurationManager(config);
 			configManager.readConfiguration();
 			for(FilesSection files : configManager.getConfig().getFiles()) {
diff --git a/src/test/java/info/fetter/logstashforwarder/FileWatcherTest.java b/src/test/java/info/fetter/logstashforwarder/FileWatcherTest.java
index 2fe8835..a98f373 100644
--- a/src/test/java/info/fetter/logstashforwarder/FileWatcherTest.java
+++ b/src/test/java/info/fetter/logstashforwarder/FileWatcherTest.java
@@ -46,7 +46,7 @@ public class FileWatcherTest {
 
 	//@Test
 	public void testFileWatch() throws InterruptedException, IOException {
-		FileWatcher watcher = new FileWatcher();
+		FileWatcher watcher = new FileWatcher(".logstash-forwarder-java");
 		watcher.addFilesToWatch("./test.txt", new Event().addField("test", "test"), FileWatcher.ONE_DAY);
 		for(int i = 0; i < 100; i++) {
 			Thread.sleep(1000);
@@ -60,7 +60,7 @@ public class FileWatcherTest {
 			logger.warn("Not executing this test on windows");
 			return;
 		}
-		FileWatcher watcher = new FileWatcher();
+		FileWatcher watcher = new FileWatcher(".logstash-forwarder-java");
 		watcher.addFilesToWatch("./testFileWatcher*.txt", new Event().addField("test", "test"), FileWatcher.ONE_DAY);
 		watcher.initialize();