diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index e96b0a6ef8d5..f779390aefd8 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codelite
-DISTVERSION=	1.0.${SVN_REVISION}
+DISTVERSION=	2.0.${SVN_REVISION}
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION}
 
@@ -27,7 +27,7 @@ HAS_CONFIGURE=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 
-SVN_REVISION=	3035
+SVN_REVISION=	3365
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index cd0b3330daf7..5f288e055e36 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,3 +1,3 @@
-MD5 (codelite-1.0.3035.tar.gz) = 7893d581468b4281370b0e999867dfcf
-SHA256 (codelite-1.0.3035.tar.gz) = c39aa45f0fff018a33efe1fd254d6971842696172b56acb2b5875541cdf76f06
-SIZE (codelite-1.0.3035.tar.gz) = 6477746
+MD5 (codelite-2.0.3365.tar.gz) = e872665a80d120de95ebd6a97177021e
+SHA256 (codelite-2.0.3365.tar.gz) = 2a78d613ea98ea83a561a06721ab4e7a8496ed57c592c3aa2d684322e0c20449
+SIZE (codelite-2.0.3365.tar.gz) = 6695128
diff --git a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
index 497e10313c06..7254ae22bba4 100644
--- a/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
+++ b/editors/codelite/files/patch-sdk-codelite_indexer_utils.cpp
@@ -1,19 +1,18 @@
---- sdk/codelite_indexer/utils.cpp.orig	2009-09-15 08:00:45.000000000 +0200
-+++ sdk/codelite_indexer/utils.cpp	2009-11-19 16:00:54.000000000 +0100
-@@ -8,6 +8,16 @@
- # include <process.h>
- # include <Tlhelp32.h>
+--- sdk/codelite_indexer/utils.cpp.orig	2009-12-07 16:27:20.000000000 +0100
++++ sdk/codelite_indexer/utils.cpp	2009-12-07 16:26:55.000000000 +0100
+@@ -11,6 +11,15 @@
+ #    include <signal.h>
  #endif
-+
-+#ifdef __FreeBSD__
-+#include <fcntl.h>
-+#include <paths.h>
-+#include <kvm.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#endif
-+
+ 
++#ifdef __FreeBSD__
++#include <fcntl.h>
++#include <paths.h>
++#include <kvm.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
  /**
   * helper string methods
   */
diff --git a/editors/codelite/pkg-plist b/editors/codelite/pkg-plist
index 8c6cd93f96c2..4f4bc3611c2a 100644
--- a/editors/codelite/pkg-plist
+++ b/editors/codelite/pkg-plist
@@ -10,13 +10,17 @@ bin/codelite_kill_children
 %%DATADIR%%/config/codelite.xml.default
 %%DATADIR%%/config/debuggers.xml.default
 %%DATADIR%%/config/plugins.xml.default
+%%DATADIR%%/images/common_tasks.png
 %%DATADIR%%/images/cubes.png
 %%DATADIR%%/images/help_earth.png
 %%DATADIR%%/images/plugin_not_ok.png
 %%DATADIR%%/images/plugin_ok.png
+%%DATADIR%%/images/recent_files.png
+%%DATADIR%%/images/recent_workspaces.png
 %%DATADIR%%/images/splashscreen.png
 %%DATADIR%%/index.html
 %%DATADIR%%/lexers/BlackTheme/lexer_asm.xml
+%%DATADIR%%/lexers/BlackTheme/lexer_batch.xml
 %%DATADIR%%/lexers/BlackTheme/lexer_cpp.xml
 %%DATADIR%%/lexers/BlackTheme/lexer_default.xml
 %%DATADIR%%/lexers/BlackTheme/lexer_diff.xml
@@ -31,6 +35,7 @@ bin/codelite_kill_children
 %%DATADIR%%/lexers/BlackTheme/lexer_script.xml
 %%DATADIR%%/lexers/BlackTheme/lexer_xml.xml
 %%DATADIR%%/lexers/Default/lexer_asm.xml
+%%DATADIR%%/lexers/Default/lexer_batch.xml
 %%DATADIR%%/lexers/Default/lexer_cpp.xml
 %%DATADIR%%/lexers/Default/lexer_default.xml
 %%DATADIR%%/lexers/Default/lexer_diff.xml
@@ -53,7 +58,6 @@ bin/codelite_kill_children
 %%DATADIR%%/plugins/QmakePlugin.so
 %%DATADIR%%/plugins/SnipWiz.so
 %%DATADIR%%/plugins/Subversion.so
-%%DATADIR%%/plugins/SymbolView.so
 %%DATADIR%%/plugins/UnitTestCPP.so
 %%DATADIR%%/plugins/abbreviation.so
 %%DATADIR%%/plugins/cscope.so
@@ -67,6 +71,7 @@ bin/codelite_kill_children
 %%DATADIR%%/plugins/resources/abbreviation.accelerators
 %%DATADIR%%/plugins/resources/compfile.png
 %%DATADIR%%/plugins/resources/cppcheck.png
+%%DATADIR%%/plugins/resources/cscope.accelerators
 %%DATADIR%%/plugins/resources/external_tools.accelerators
 %%DATADIR%%/plugins/resources/qt16_new.png
 %%DATADIR%%/plugins/resources/qt16_preferences.png
@@ -88,13 +93,26 @@ bin/codelite_kill_children
 %%DATADIR%%/templates/formbuilder/PanelTemplate.fbp
 %%DATADIR%%/templates/gizmos/app.cpp.wizard
 %%DATADIR%%/templates/gizmos/app.h.wizard
+%%DATADIR%%/templates/gizmos/gui-dialog.cpp.wizard
+%%DATADIR%%/templates/gizmos/gui-dialog.fbp.wizard
+%%DATADIR%%/templates/gizmos/gui-dialog.h.wizard
+%%DATADIR%%/templates/gizmos/gui-frame.cpp.wizard
+%%DATADIR%%/templates/gizmos/gui-frame.fbp.wizard
+%%DATADIR%%/templates/gizmos/gui-frame.h.wizard
 %%DATADIR%%/templates/gizmos/liteeditor-plugin.project.wizard
+%%DATADIR%%/templates/gizmos/main-dialog.cpp.wizard
+%%DATADIR%%/templates/gizmos/main-dialog.h.wizard
+%%DATADIR%%/templates/gizmos/main-frame.cpp.wizard
+%%DATADIR%%/templates/gizmos/main-frame.h.wizard
 %%DATADIR%%/templates/gizmos/main.cpp.wizard
 %%DATADIR%%/templates/gizmos/mainframe.cpp.wizard
 %%DATADIR%%/templates/gizmos/mainframe.h.wizard
 %%DATADIR%%/templates/gizmos/plugin.cpp.wizard
 %%DATADIR%%/templates/gizmos/plugin.h.wizard
+%%DATADIR%%/templates/gizmos/resources.rc.wizard
+%%DATADIR%%/templates/gizmos/wx_pch.h.wizard
 %%DATADIR%%/templates/gizmos/wxmain.project.wizard
+%%DATADIR%%/templates/gizmos/wxproject-fb.project.wizard
 %%DATADIR%%/templates/gizmos/wxproject.project.wizard
 %%DATADIR%%/templates/projects/UnitTest++/UnitTest++.project
 %%DATADIR%%/templates/projects/UnitTest++/icon.png