diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a981a79..09d96051 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ find_package(CURL REQUIRED)
 if(WIN32)
     find_package(PhysX REQUIRED)  #TODO: Not required if we aren't building the client
     find_package(DirectX REQUIRED)
+    find_package(Freetype)
 endif(WIN32)
 
 find_package(MaxSDK)          #TODO: Only find this if we are building PlasmaMax
diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt
index 7ffc2291..a9d02543 100644
--- a/Sources/Tools/CMakeLists.txt
+++ b/Sources/Tools/CMakeLists.txt
@@ -1,8 +1,11 @@
 #add_subdirectory(Migration)
 #add_subdirectory(plDatMerger)
-#add_subdirectory(plFontConverter)
 add_subdirectory(plResBrowser)
 
+if(FREETYPE_FOUND)
+    add_subdirectory(plFontConverter)
+endif()
+
 # Max Stuff goes below here...
 if(3dsm_BUILD_PLUGIN)
     add_definitions(-DMAXPLUGINCODE)
diff --git a/Sources/Tools/plFontConverter/CMakeLists.txt b/Sources/Tools/plFontConverter/CMakeLists.txt
new file mode 100644
index 00000000..093ec6f8
--- /dev/null
+++ b/Sources/Tools/plFontConverter/CMakeLists.txt
@@ -0,0 +1,51 @@
+include_directories("../../Plasma/CoreLib")
+include_directories("../../Plasma/NucleusLib")
+include_directories("../../Plasma/NucleusLib/inc")
+include_directories("../../Plasma/PubUtilLib")
+include_directories(${FREETYPE_INCLUDE_DIRS})
+
+set(plFontConverter_HEADERS
+    plFontFreeType.h
+)
+
+set(plFontConverter_SOURCES
+    plFontConverter.cpp
+    plFontConverterProc.cpp
+    plFontFreeType.cpp
+)
+    
+set(plFontConverter_RESOURCES
+    res/plFontConverter.rc
+    res/resource.h
+    res/icon1.ico
+)
+    
+add_executable(plFontConverter WIN32 ${plFontConverter_SOURCES} ${plFontConverter_HEADERS} ${plFontConverter_RESOURCES})
+
+target_link_libraries(plFontConverter CoreLib)
+target_link_libraries(plFontConverter CoreLibExe)
+target_link_libraries(plFontConverter pnKeyedObject)
+target_link_libraries(plFontConverter pnSceneObject)
+target_link_libraries(plFontConverter pnProduct)
+target_link_libraries(plFontConverter plGImage)
+target_link_libraries(plFontConverter plJPEG)
+target_link_libraries(plFontConverter plMessage)
+target_link_libraries(plFontConverter plPipeline)
+target_link_libraries(plFontConverter plResMgr)
+target_link_libraries(plFontConverter ${JPEG_LIBRARY})
+target_link_libraries(plFontConverter ${DirectX_LIBRARIES})
+target_link_libraries(plFontConverter ${FREETYPE_LIBRARIES})
+
+if (WIN32)
+    target_link_libraries(plFontConverter Rpcrt4)
+    target_link_libraries(plFontConverter Vfw32)
+    target_link_libraries(plFontConverter Ws2_32)
+    target_link_libraries(plFontConverter winmm)
+    target_link_libraries(plFontConverter strmiids)
+    target_link_libraries(plFontConverter comctl32)
+    target_link_libraries(plFontConverter shlwapi)
+endif(WIN32)
+
+source_group("Source Files" FILES ${plFontConverter_SOURCES})
+source_group("Header Files" FILES ${plFontConverter_HEADERS})
+source_group("Resource Files" FILES ${plFontConverter_RESOURCES})
diff --git a/Sources/Tools/plFontConverter/plFontConverterProc.cpp b/Sources/Tools/plFontConverter/plFontConverterProc.cpp
index 6530e2ea..8f48a5ef 100644
--- a/Sources/Tools/plFontConverter/plFontConverterProc.cpp
+++ b/Sources/Tools/plFontConverter/plFontConverterProc.cpp
@@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "hsResMgr.h"
 #include "plFontFreeType.h"
-#include "../plGImage/plFont.h"
-#include "../plGImage/plMipmap.h"
-#include "../pnKeyedObject/plUoid.h"
-#include "../pnKeyedObject/plKeyImp.h"
+#include "plGImage/plFont.h"
+#include "plGImage/plMipmap.h"
+#include "pnKeyedObject/plUoid.h"
+#include "pnKeyedObject/plKeyImp.h"
 
 
 extern HINSTANCE    gInstance;
diff --git a/Sources/Tools/plFontConverter/plFontFreeType.h b/Sources/Tools/plFontConverter/plFontFreeType.h
index bfbd4976..b98e8527 100644
--- a/Sources/Tools/plFontConverter/plFontFreeType.h
+++ b/Sources/Tools/plFontConverter/plFontFreeType.h
@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "plFont.h"
+#include "plGImage/plFont.h"
 
 class plFontFreeType : public plFont
 {