diff --git a/CHANGES.md b/CHANGES.md
index 0c3d7b46c3..29a6a983b5 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,7 @@ Features
 * [#512](https://github.com/java-native-access/jna/pull/512): Make loading debug flags mutable [@lwahonen](https://github.com/lwahonen).
 * [#514](https://github.com/java-native-access/jna/pull/514): Added `host_processor_info` to `com.sun.jna.platform.mac.SystemB`  - [@dbwiddis](https://github.com/dbwiddis).
 * [#519](https://github.com/java-native-access/jna/pull/519): Added JNA functional overview - [@twall](https://github.com/twall).
+* [#528](https://github.com/java-native-access/jna/pull/528): Added idea-jar ant task that creates a convenience jar that contains all native dispatch libraries - [@lwahonen](https://github.com/lwahonen).
 
 Bug Fixes
 ---------
diff --git a/build.xml b/build.xml
index 7a42361062..8ece41f9bf 100644
--- a/build.xml
+++ b/build.xml
@@ -549,6 +549,12 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     </subant>
   </target>
 
+  <target name="idea-jar" depends="jar" description="Build Intellij Idea convenience jar">
+    <jar destfile="${dist}/idea-dispatch.jar">
+      <zipfileset src="${dist-jar}" excludes="**/*.class"/>
+    </jar>
+  </target>
+
   <target name="javah" depends="compile" unless="-native">
     <javah classpath="${classes}" destdir="${build.native}" force="yes">
       <class name="com.sun.jna.Function"/>
diff --git a/www/DevelopInIDE.md b/www/DevelopInIDE.md
new file mode 100644
index 0000000000..7217ddffbc
--- /dev/null
+++ b/www/DevelopInIDE.md
@@ -0,0 +1,9 @@
+Hacking on JNA with IntelliJ IDEA
+======================================
+
+The idea-jar target generates a jar that contains all the native bits needed by JNA.
+
+Create a new module for JNA in Idea, mark the src folder as sources, testsrc as test sources.
+Add a library to the module, include all jars from lib, lib/test and the idea-dispatch.jar generated by aforementioned ant target.
+
+After this, you should be able to use JNA in your own code via this module, instead of including a JNA jar. This also speeds up development quite considerably, as you don't need to rebuild JNA jar between code changes.