diff --git a/lib/wind/ChangeLog b/lib/wind/ChangeLog
index b5ffef211..f484aad84 100644
--- a/lib/wind/ChangeLog
+++ b/lib/wind/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* rename wind_punycode_toascii to wind_punycode_label_toascii
+
+	* stringprep.c: Move else to make it work again.
+
 2008-02-11  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* Add partial support for LDAP-prep Insignificant Character Handling
diff --git a/lib/wind/test-punycode.c b/lib/wind/test-punycode.c
index e65625728..ea5fe0123 100644
--- a/lib/wind/test-punycode.c
+++ b/lib/wind/test-punycode.c
@@ -55,7 +55,7 @@ main(void)
 	size_t len;
 
 	len = sizeof(buf);
-	ret = wind_punycode_toascii(e->val, e->len, buf, &len);
+	ret = wind_punycode_label_toascii(e->val, e->len, buf, &len);
 	if (ret < 0) {
 	    printf("punycode %u (%s) failed: %d\n", i, e->description, ret);
 	    ++failures;
diff --git a/lib/wind/version-script.map b/lib/wind/version-script.map
index 2d87425f6..9c45accce 100644
--- a/lib/wind/version-script.map
+++ b/lib/wind/version-script.map
@@ -4,7 +4,7 @@ HEIMDAL_WIND_1.0 {
 	global:
 		wind_stringprep;
 		wind_profile;
-		wind_punycode_toascii;
+		wind_punycode_label_toascii;
 		wind_utf8ucs4;
 		wind_utf8ucs4_length;
 		wind_ucs4utf8;
diff --git a/lib/wind/wind.h b/lib/wind/wind.h
index 8d832214a..c4c9abf4c 100644
--- a/lib/wind/wind.h
+++ b/lib/wind/wind.h
@@ -63,8 +63,8 @@ int wind_stringprep(const unsigned *in, size_t in_len,
 		    wind_profile_flags flags);
 int wind_profile(const char *, wind_profile_flags *);
 
-int wind_punycode_toascii(const uint32_t *in, size_t in_len,
-			  char *out, size_t *out_len);
+int wind_punycode_label_toascii(const uint32_t *, size_t,
+				char *, size_t *);
 
 int wind_utf8ucs4(const char *, uint32_t *, size_t *);
 int wind_utf8ucs4_length(const char *, size_t *);