diff --git a/lib/java/Makefile b/lib/java/Makefile
index 20f439e7d06c073ab30036e7b13fd8ff85efc530..060aeeba5ea2854ab8c8f2790325540854545366 100644
--- a/lib/java/Makefile
+++ b/lib/java/Makefile
@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
 
 labcomm.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
 
 labcomm2014.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class
 
 labcomm2006.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
 
 gen:
 	mkdir gen
@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
 .PHONY: clean
 
 clean:
-	rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen 
-
+	rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
diff --git a/lib/java/osgi-manifest.txt b/lib/java/osgi-manifest.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49ca3d6cd68f2212c9ab0d74a709ed38c6a2c233
--- /dev/null
+++ b/lib/java/osgi-manifest.txt
@@ -0,0 +1,8 @@
+Bundle-Description: Provides Labcomm to bundles
+Bundle-ManifestVersion: 2
+Bundle-Name: Labcomm OSGi
+Bundle-SymbolicName: se.lth.control.labcomm
+Bundle-Vendor: LTH
+Bundle-Version: 1.0.0
+Export-Package: se.lth.control.labcomm;version="1.0.0",se.lth.control.la
+ bcomm2006;version="1.0.0"