diff -Naur doxygen-1.6.1/PLATFORMS doxygen-1.6.1-haiku/PLATFORMS
--- doxygen-1.6.1/PLATFORMS	2007-11-24 09:12:35.000000000 -0700
+++ doxygen-1.6.1-haiku/PLATFORMS	2009-11-07 13:02:41.000000000 -0700
@@ -4,6 +4,7 @@
 dgux-g++
 freebsd-g++
 gnu-g++
+haiku-g++
 hpux-acc
 hpux-cc
 hpux-g++
diff -Naur doxygen-1.6.1/configure doxygen-1.6.1-haiku/configure
--- doxygen-1.6.1/configure	2009-08-25 03:49:10.000000000 -0600
+++ doxygen-1.6.1-haiku/configure	2009-11-07 13:01:31.000000000 -0700
@@ -180,6 +180,9 @@
         f_insttool=/usr/bin/install
       fi
       ;;
+    Haiku:*)
+      f_platform=haiku-g++
+      ;;
     HP-UX:*)
       f_platform=hpux-g++
       if test "$f_insttool" = NO; then
diff -Naur doxygen-1.6.1/qtools/qglobal.h doxygen-1.6.1-haiku/qtools/qglobal.h
--- doxygen-1.6.1/qtools/qglobal.h	2008-12-06 06:16:20.000000000 -0700
+++ doxygen-1.6.1-haiku/qtools/qglobal.h	2009-11-07 13:09:09.000000000 -0700
@@ -147,6 +147,8 @@
 #define _OS_CYGWIN_
 #elif defined(__BEOS__)
 #define _OS_BEOS_
+#elif defined(__HAIKU__)
+#define _OS_HAIKU_
 #elif defined(__MINT__)
 #define _OS_MINT_
 #else
diff -Naur doxygen-1.6.1/src/doxygen.pro.in doxygen-1.6.1-haiku/src/doxygen.pro.in
--- doxygen-1.6.1/src/doxygen.pro.in	2009-08-02 07:55:02.000000000 -0600
+++ doxygen-1.6.1-haiku/src/doxygen.pro.in	2009-11-07 13:19:57.000000000 -0700
@@ -19,6 +19,7 @@
 HEADERS      =	doxygen.h 
 SOURCES      =	main.cpp 
 unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
+haiku-g++:LIBS             += -L/boot/common/lib -liconv
 win32:INCLUDEPATH          += .
 win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
 win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/app.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t
--- doxygen-1.6.1/tmake/lib/haiku-g++/app.t	1969-12-31 17:00:00.000000000 -0700
+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t	2009-11-07 13:04:20.000000000 -0700
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/app.t");
diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/lib.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t
--- doxygen-1.6.1/tmake/lib/haiku-g++/lib.t	1969-12-31 17:00:00.000000000 -0700
+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t	2009-11-07 13:04:20.000000000 -0700
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/lib.t");
diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t
--- doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t	1969-12-31 17:00:00.000000000 -0700
+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t	2009-11-07 13:04:20.000000000 -0700
@@ -0,0 +1,2 @@
+#! Use the common Unix template
+#$ IncludeTemplate("../unix/subdirs.t");
diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf
--- doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf	1969-12-31 17:00:00.000000000 -0700
+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf	2009-11-07 13:09:42.000000000 -0700
@@ -0,0 +1,51 @@
+#
+# 
+#
+# tmake configuration for haiku-g++
+#
+
+TEMPLATE		= app
+CONFIG			= qt warn_on release
+
+TMAKE_CC		= gcc
+TMAKE_CFLAGS		=
+TMAKE_CFLAGS_WARN_ON	= -Wall -W
+TMAKE_CFLAGS_WARN_OFF	=
+TMAKE_CFLAGS_RELEASE	=
+TMAKE_CFLAGS_DEBUG	= -g
+TMAKE_CFLAGS_SHLIB	= -fPIC
+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+
+TMAKE_CXX		= g++
+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
+
+TMAKE_INCDIR		=
+TMAKE_LIBDIR		=
+TMAKE_INCDIR_QT		= $(QTDIR)/include
+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
+
+TMAKE_LINK		= g++
+TMAKE_LINK_SHLIB	= g++
+TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
+TMAKE_LFLAGS_RELEASE	=
+TMAKE_LFLAGS_DEBUG	=
+TMAKE_LFLAGS_SHLIB	= -shared
+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
+
+TMAKE_LIBS		=
+TMAKE_LIBS_QT		= -lqt
+TMAKE_LIBS_QT_MT	= -lqt-mt
+
+TMAKE_MOC		= moc
+
+TMAKE_AR		= ar cqs
+TMAKE_RANLIB		=
+
+TMAKE_TAR		= tar -cf
+TMAKE_GZIP		= gzip -9f
