@@ -88,10 +88,12 @@
 - (OFString*)OF_JSONRepresentationWithOptions: (int)options
 					depth: (size_t)depth;
 @end
 
 extern bool of_unicode_to_iso_8859_2(const of_unichar_t*, unsigned char*,
+    size_t, bool);
+extern bool of_unicode_to_iso_8859_3(const of_unichar_t*, unsigned char*,
     size_t, bool);
 extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, unsigned char*,
     size_t, bool);
 extern bool of_unicode_to_windows_1251(const of_unichar_t*, unsigned char*,
     size_t, bool);
@@ -144,10 +146,13 @@
 	    [string isEqual: @"iso_8859-1"])
 		encoding = OF_STRING_ENCODING_ISO_8859_1;
 	else if ([string isEqual: @"iso-8859-2"] ||
 	    [string isEqual: @"iso_8859-2"])
 		encoding = OF_STRING_ENCODING_ISO_8859_2;
+	else if ([string isEqual: @"iso-8859-3"] ||
+	    [string isEqual: @"iso_8859-3"])
+		encoding = OF_STRING_ENCODING_ISO_8859_3;
 	else if ([string isEqual: @"iso-8859-15"] ||
 	    [string isEqual: @"iso_8859-15"])
 		encoding = OF_STRING_ENCODING_ISO_8859_15;
 	else if ([string isEqual: @"windows-1251"] ||
 	    [string isEqual: @"cp1251"] || [string isEqual: @"cp-1251"] ||
@@ -1132,10 +1137,23 @@
 		    (unsigned char*)cString, length, lossy))
 			@throw [OFInvalidEncodingException exception];
 
 		cString[length] = '\0';
 
+		return length;
+#endif
+#ifdef HAVE_ISO_8859_3
+	case OF_STRING_ENCODING_ISO_8859_3:
+		if (length + 1 > maxLength)
+			@throw [OFOutOfRangeException exception];
+
+		if (!of_unicode_to_iso_8859_3(characters,
+		    (unsigned char*)cString, length, lossy))
+			@throw [OFInvalidEncodingException exception];
+
+		cString[length] = '\0';
+
 		return length;
 #endif
 #ifdef HAVE_ISO_8859_15
 	case OF_STRING_ENCODING_ISO_8859_15:
 		if (length + 1 > maxLength)
@@ -1306,10 +1324,11 @@
 
 		break;
 	case OF_STRING_ENCODING_ASCII:
 	case OF_STRING_ENCODING_ISO_8859_1:
 	case OF_STRING_ENCODING_ISO_8859_2:
+	case OF_STRING_ENCODING_ISO_8859_3:
 	case OF_STRING_ENCODING_ISO_8859_15:
 	case OF_STRING_ENCODING_WINDOWS_1251:
 	case OF_STRING_ENCODING_WINDOWS_1252:
 	case OF_STRING_ENCODING_CODEPAGE_437:
 	case OF_STRING_ENCODING_CODEPAGE_850:
@@ -1377,10 +1396,11 @@
 
 		return UTF8StringLength;
 	case OF_STRING_ENCODING_ASCII:
 	case OF_STRING_ENCODING_ISO_8859_1:
 	case OF_STRING_ENCODING_ISO_8859_2:
+	case OF_STRING_ENCODING_ISO_8859_3:
 	case OF_STRING_ENCODING_ISO_8859_15:
 	case OF_STRING_ENCODING_WINDOWS_1251:
 	case OF_STRING_ENCODING_WINDOWS_1252:
 	case OF_STRING_ENCODING_CODEPAGE_437:
 	case OF_STRING_ENCODING_CODEPAGE_850: