diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 1daff24ab3..828cdecaae 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -83,7 +83,7 @@ SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
 	libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
 	libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
 	libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
-	libilmimf.so libiconv.so liblocale.so $(HAIKU_SHARED_LIBSUPC++)
+	libilmimf.so $(HAIKU_SHARED_LIBSUPC++)
 ;
 SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
 	net_server media_addon_server input_server app_server fake_app_server
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index f3308a1dfe..c35ea6320e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -356,7 +356,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 
 	# third party libs headers
 	AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ;
-	AddHeaderDirectoryToHaikuImage libs iconv : 3rdparty ;
 	AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ;
 	AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;
 	AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ;
diff --git a/headers/posix/iconv.h b/headers/posix/iconv.h
deleted file mode 100644
index f4904071a8..0000000000
--- a/headers/posix/iconv.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _ICONV_H_
-#define _ICONV_H_
-/* 
-** Distributed under the terms of the OpenBeOS License.
-*/
-#include <size_t.h>
-
-typedef void *iconv_t;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern iconv_t	iconv_open(const char *toCode, const char *fromCode);
-extern int		iconv_close(iconv_t cd);
-extern size_t	iconv(iconv_t cd, char **inBuffer, size_t *inBytesLeft,
-					char **outBuffer, size_t *outBytesLeft);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _ICONV_H_ */
diff --git a/src/kits/textencoding/Jamfile b/src/kits/textencoding/Jamfile
index a0ae840aab..09ac22f5dd 100644
--- a/src/kits/textencoding/Jamfile
+++ b/src/kits/textencoding/Jamfile
@@ -11,7 +11,7 @@ SharedLibrary libtextencoding.so :
 	CharacterSetRoster.cpp
 	character_sets.cpp
 	utf8_conversions.cpp
-	: be libiconv.so $(TARGET_LIBSUPC++) ;
+	: be libiconv.a $(TARGET_LIBSUPC++) ;
 
 Package haiku-maildaemon-cvs :
 	libtextencoding.so :
diff --git a/src/libs/iconv/Jamfile b/src/libs/iconv/Jamfile
index c61c8c1869..1d3e90948d 100644
--- a/src/libs/iconv/Jamfile
+++ b/src/libs/iconv/Jamfile
@@ -14,7 +14,7 @@ SubDirCcFlags
 	-DICONV_CONST=""
 	;
 
-SharedLibrary libiconv.so :	
+StaticLibrary libiconv.a :	
 	iconv.c
 	localcharset.c
 	;