diff --git a/build.xml b/build.xml
index 04ddf32d..3a01824f 100644
--- a/build.xml
+++ b/build.xml
@@ -747,6 +747,17 @@
 	</target>
 
 
+	<target name="website-docs" depends="revision">
+		<javadoc destdir="${dir.dist}/website/docs" linksource="yes" access="public" classpathref="lib.classpath" encoding="UTF-8" charset="UTF-8" windowtitle="${application.name}" noindex="yes" nohelp="yes" notree="yes" nodeprecated="yes" nonavbar="yes">
+			<fileset dir="${dir.source}" includesfile="${dir.website}/docs/includes.fileset" />
+			<doctitle>${application.name} ${application.version}</doctitle>
+			<bottom>${application.name} ${application.version} (r${revision}) built on ${tstamp.date}</bottom>
+			<link href="http://docs.oracle.com/javase/${jre.major}/docs/api/" />
+			<link href="http://docs.groovy-lang.org/latest/html/api/" />
+		</javadoc>
+	</target>
+
+
 	<target name="revision" depends="init">
 		<exec executable="git" outputproperty="revision" failonerror="true">
 			<arg line="rev-list --count master" />
@@ -815,7 +826,10 @@
 	</target>
 
 
-	<target name="deploy-website" description="Upload website resources" depends="init">
+	<target name="deploy-website" description="Upload website resources" depends="revision">
+		<!-- generate docs -->
+		<antcall target="website-docs" />
+
 		<!-- copy image resources -->
 		<copy todir="${dir.dist}/website/resources" preservelastmodified="yes" verbose="yes" flatten="true">
 			<fileset dir="${dir.source}/net/filebot/resources">
diff --git a/source/net/filebot/format/Define.java b/source/net/filebot/format/Define.java
index 50e425c1..727e2a9f 100644
--- a/source/net/filebot/format/Define.java
+++ b/source/net/filebot/format/Define.java
@@ -1,14 +1,14 @@
 
 package net.filebot.format;
 
-
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-
+@Documented
 @Retention(RUNTIME)
 @Target(METHOD)
 public @interface Define {
diff --git a/website/docs/includes.fileset b/website/docs/includes.fileset
new file mode 100644
index 00000000..ee6d8ae7
--- /dev/null
+++ b/website/docs/includes.fileset
@@ -0,0 +1,17 @@
+**/MediaBindingBean.java
+**/Define.java
+**/ExpressionFormatMethods.java
+**/ExpressionFormatFunctions.java
+**/ScriptShellBaseClass.java
+**/ScriptShellMethods.java
+**/Episode.java
+**/SeriesInfo.java
+**/EpisodeInfo.java
+**/Movie.java
+**/MoviePart.java
+**/MovieInfo.java
+**/AudioTrack.java
+**/Crew.java
+**/Person.java
+**/SimpleDate.java
+**/Language.java