diff --git a/configure.ac b/configure.ac
index dc578e4..4c91cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,34 +95,6 @@ AC_ARG_VAR([ICONV_LIBS], [linker flags for iconv])
 CPPFLAGS="${CPPFLAGS} ${ICONV_CFLAGS}"
 LIBS="${LIBS} ${ICONV_LIBS}"
 
-AC_MSG_CHECKING([iconv can handle const])
-OLD_CPPFLAGS="${CPPFLAGS}"
-test "${GCC}" = "yes" && CPPFLAGS="${CPPFLAGS} -Werror"
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[
-#include <iconv.h>
-#include <stdlib.h>
-		]],
-		[[
-const char *test1 = NULL;
-iconv (
-	(iconv_t)0,
-	&test1,
-	NULL,
-	NULL,
-	NULL
-);
-		]]
-	)],
-	[AC_MSG_RESULT([yes])],
-	[
-		AC_MSG_RESULT([no])
-		AC_DEFINE([HAVE_OLD_ICONV], [1], [Iconv does not support const])
-	]
-)
-CPPFLAGS="${OLD_CPPFLAGS}"
-
 if test "${enable_pedantic}" = "yes"; then
 	enable_strict="yes";
 	CXXFLAGS="${CXXFLAGS} -pedantic"
diff --git a/mp3unicode.cpp b/mp3unicode.cpp
index 9f676c0..ca25941 100644
--- a/mp3unicode.cpp
+++ b/mp3unicode.cpp
@@ -229,10 +229,7 @@ class Converter {
 			if (
 				iconv (
 					cd,
-#ifdef HAVE_OLD_ICONV
-					(char **)
-#endif
-					&from,
+					(char **)&from,
 					&from_size,
 					&to,
 					&to_size