diff --git a/contrib/jdt-null-annotations/.classpath b/contrib/jdt-null-annotations/.classpath
index 8727917..304e861 100644
--- a/contrib/jdt-null-annotations/.classpath
+++ b/contrib/jdt-null-annotations/.classpath
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/contrib/jdt-null-annotations/.project b/contrib/jdt-null-annotations/.project
index 53ba8e4..e27376c 100644
--- a/contrib/jdt-null-annotations/.project
+++ b/contrib/jdt-null-annotations/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/contrib/jdt-null-annotations/META-INF/MANIFEST.MF b/contrib/jdt-null-annotations/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ba5c0f6
--- /dev/null
+++ b/contrib/jdt-null-annotations/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Annotations for Enhanced Null Analysis
+Bundle-SymbolicName: org.eclipse.jdt.annotation.null
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.eclipse.jdt.annotation
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Stephan Herrmann
diff --git a/contrib/jdt-null-annotations/build.properties b/contrib/jdt-null-annotations/build.properties
new file mode 100644
index 0000000..b107977
--- /dev/null
+++ b/contrib/jdt-null-annotations/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .
diff --git a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNull.java b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNull.java
index 3f07d5c..fa1b0b8 100644
--- a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNull.java
+++ b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNull.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 GK Software AG and others.
+ * Copyright (c) 2011 Stephan Herrmann.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNullByDefault.java b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNullByDefault.java
index ea6755d..688fbad 100644
--- a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNullByDefault.java
+++ b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NonNullByDefault.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 GK Software AG and others.
+ * Copyright (c) 2011 Stephan Herrmann.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/Nullable.java b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/Nullable.java
index 7e93283..0526714 100644
--- a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/Nullable.java
+++ b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/Nullable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 GK Software AG and others.
+ * Copyright (c) 2011 Stephan Herrmann.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NullableByDefault.java b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NullableByDefault.java
index 9d2c61c..dd840b3 100644
--- a/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NullableByDefault.java
+++ b/contrib/jdt-null-annotations/src/org/eclipse/jdt/annotation/NullableByDefault.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 GK Software AG and others.
+ * Copyright (c) 2011 Stephan Herrmann.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at