Index: modules/univention/s4connector/__init__.py
===================================================================
--- modules/univention/s4connector/__init__.py	(Revision 78728)
+++ modules/univention/s4connector/__init__.py	(Arbeitskopie)
@@ -1336,7 +1336,7 @@
 
 		if object['attributes'].get('objectGUID'):
 			guid_unicode = object['attributes'].get('objectGUID')[0]
-			objectGUID = guid_unicode.encode('ISO-8859-1')  # to compensate for __object_from_element
+			objectGUID = guid_unicode.encode('latin1')  # to compensate for __object_from_element
 		else:
 			objectGUID = None
 		entryUUID = self._get_entryUUID(object['dn'])
@@ -1447,7 +1447,7 @@
 
 		try:
 			guid_unicode = original_object.get('attributes').get('objectGUID')[0]
-			guid_blob = guid_unicode.encode('ISO-8859-1')  # to compensate for __object_from_element
+			guid_blob = guid_unicode.encode('latin1')  # to compensate for __object_from_element
 			guid = str(ndr_unpack(misc.GUID, guid_blob))
 
 			object['changed_attributes'] = []
Index: modules/univention/s4connector/s4/__init__.py
===================================================================
--- modules/univention/s4connector/s4/__init__.py	(Revision 78738)
+++ modules/univention/s4connector/s4/__init__.py	(Arbeitskopie)
@@ -710,20 +710,20 @@
 
 
 def compatible_list(list):
-	return encode_list(decode_list(list, 'latin'), 'utf8')
+	return encode_list(decode_list(list, 'latin1'), 'utf8')
 
 
 def compatible_modlist(list):
-	return encode_modlist(decode_modlist(list, 'latin'), 'utf8')
+	return encode_modlist(decode_modlist(list, 'latin1'), 'utf8')
 
 
 def compatible_addlist(list):
-	return encode_addlist(decode_addlist(list, 'latin'), 'utf8')
+	return encode_addlist(decode_addlist(list, 'latin1'), 'utf8')
 
 
 def compatible_modstring(string):
 	if hasattr(string, 'decode') and not isinstance(string, types.UnicodeType):
-		string = string.decode('latin')
+		string = string.decode('latin1')
 	if hasattr(string, 'encode'):
 		string = string.encode('utf8')
 	return string
@@ -991,7 +991,7 @@
 		try:
 			return unicode(string)
 		except:  # FIXME: which exception is to be caught?
-			return unicode(string, 'Latin-1')
+			return unicode(string, 'latin1')
 
 	def _get_lastUSN(self):
 		_d = ud.function('ldap._get_lastUSN')
@@ -1019,9 +1019,9 @@
 	def __encode_GUID(self, GUID):
 		# GUID may be unicode
 		if isinstance(GUID, type(u'')):
-			return GUID.encode('ISO-8859-1').encode('base64')
+			return GUID.encode('latin1').encode('base64')
 		else:
-			return unicode(GUID, 'latin').encode('ISO-8859-1').encode('base64')
+			return GUID.encode('base64')
 
 	def _get_DN_for_GUID(self, GUID):
 		_d = ud.function('ldap._get_DN_for_GUID')