diff --git a/lib/java/Makefile b/lib/java/Makefile
index c6a483daae99e03c8cebfab5239b40ddeabc5e67..cfed416c0954bc5452f90ef32cf111b77b8e4b69 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -20,21 +20,19 @@ MODULES=Constant \
 
 all: labcomm.jar labcomm2014.jar labcomm2006.jar
 
-labcomm.jar: gen/JAVAC osgi-manifest-all.txt
+labcomm.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cfm ../$@ ../osgi-manifest-all.txt \
+	cd gen ; jar cfm ../$@ \
 		se/lth/control/labcomm/*.class \
 		se/lth/control/labcomm2006/*.class
 
-labcomm2014.jar: gen/JAVAC osgi-manifest-2014.txt
+labcomm2014.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cfm ../$@ ../osgi-manifest-2014.txt \
-		se/lth/control/labcomm/*.class
+	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
 
-labcomm2006.jar: gen/JAVAC osgi-manifest-2006.txt
+labcomm2006.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cfm ../$@ ../osgi-manifest-2006.txt \
-		se/lth/control/labcomm2006/*.class
+	cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class
 
 gen:
 	mkdir gen
@@ -43,7 +41,7 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) \
 	   $(MODULES:%=se/lth/control/labcomm2006/%.java) \
 	   Makefile | gen
 	javac -cp ../../compiler/labcomm_compiler.jar -d gen \
-		$(filter %.java, $^) 
+            $(filter %.java, $^)
 	touch $@
 
 
diff --git a/lib/java/osgi-manifest-2006.txt b/lib/java/osgi-manifest-2006.txt
deleted file mode 100644
index 4ef6bdac0f7ccc0b4fe0c729b46bb81d67d36dce..0000000000000000000000000000000000000000
--- a/lib/java/osgi-manifest-2006.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Description: Provides Labcomm to bundles
-Bundle-ManifestVersion: 2
-Bundle-Name: Labcomm OSGi
-Bundle-SymbolicName: se.lth.control.labcomm2006
-Bundle-Vendor: LTH
-Bundle-Version: 1.0.0
-Export-Package: se.lth.control.labcomm2006;version="1.0.0"
diff --git a/lib/java/osgi-manifest-2014.txt b/lib/java/osgi-manifest-2014.txt
deleted file mode 100644
index 53d3954c8f022190a5163fedf2421fe8795ab77d..0000000000000000000000000000000000000000
--- a/lib/java/osgi-manifest-2014.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Description: Provides Labcomm 2014 to bundles
-Bundle-ManifestVersion: 2
-Bundle-Name: Labcomm OSGi
-Bundle-SymbolicName: se.lth.control.labcomm2014
-Bundle-Vendor: LTH
-Bundle-Version: 1.0.0
-Export-Package: se.lth.control.labcomm;version="1.0.0"
diff --git a/lib/java/osgi-manifest-all.txt b/lib/java/osgi-manifest-all.txt
deleted file mode 100644
index 4a691e7fffa1ae585f7c245174645f61f2b605d7..0000000000000000000000000000000000000000
--- a/lib/java/osgi-manifest-all.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-Description: Provides Labcomm 2006/2014 to bundles
-Bundle-ManifestVersion: 2
-Bundle-Name: Labcomm OSGi
-Bundle-SymbolicName: se.lth.control.labcomm-all
-Bundle-Vendor: LTH
-Bundle-Version: 1.0.0
-Export-Package: se.lth.control.labcomm2006;version="1.0.0",
- se.lth.control.labcomm;version="1.0.0"