diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7b7d9f815..fb48eaba4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -263,6 +263,6 @@
 		</receiver>
 		<activity android:name="org.geometerplus.android.fbreader.tips.TipsActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="com.paragon.dictionary.fbreader.OpenDictionaryActivity" android:theme="@style/FBReader.Transparent" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<service android:name="org.geometerplus.android.fbreader.httpd.VideoService" android:launchMode="singleTask" android:process=":videoService" android:exported="false"/>
+		<service android:name="org.geometerplus.android.fbreader.httpd.DataService" android:launchMode="singleTask" android:process=":dataService" android:exported="false"/>
 	</application>
 </manifest>
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index e75f51c3d..b1d5549b0 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -263,6 +263,6 @@
 		</receiver>
 		<activity android:name="org.geometerplus.android.fbreader.tips.TipsActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="com.paragon.dictionary.fbreader.OpenDictionaryActivity" android:theme="@style/FBReader.Transparent" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<service android:name="org.geometerplus.android.fbreader.httpd.VideoService" android:launchMode="singleTask" android:process=":videoService" android:exported="false"/>
+		<service android:name="org.geometerplus.android.fbreader.httpd.DataService" android:launchMode="singleTask" android:process=":dataService" android:exported="false"/>
 	</application>
 </manifest>
diff --git a/src/org/geometerplus/android/fbreader/httpd/VideoServer.java b/src/org/geometerplus/android/fbreader/httpd/DataServer.java
similarity index 100%
rename from src/org/geometerplus/android/fbreader/httpd/VideoServer.java
rename to src/org/geometerplus/android/fbreader/httpd/DataServer.java
diff --git a/src/org/geometerplus/android/fbreader/httpd/VideoService.java b/src/org/geometerplus/android/fbreader/httpd/DataService.java
similarity index 96%
rename from src/org/geometerplus/android/fbreader/httpd/VideoService.java
rename to src/org/geometerplus/android/fbreader/httpd/DataService.java
index 509c4c7ab..2b12e4dde 100644
--- a/src/org/geometerplus/android/fbreader/httpd/VideoService.java
+++ b/src/org/geometerplus/android/fbreader/httpd/DataService.java
@@ -32,6 +32,7 @@ public class VideoService extends Service {
 			public void run () {
 				try {
 					myServer = new VideoServer();
+        			myServer.start();
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -46,6 +47,7 @@ public class VideoService extends Service {
 			new Thread(new Runnable() {
 				public void run () {
 					myServer.stop();
+					myServer = null;
 				}
 			}).start();
 		}