diff --git a/CHANGES b/CHANGES
index 2fdbeee5e19ad2ec89d96010d2fb6ec95c34e8f6..a19f335439c68f3f54866a28e26805c5c11c5eda 100755
--- a/CHANGES
+++ b/CHANGES
@@ -25,8 +25,12 @@ necessary for such releases.
 
 SWITCHwayf Changes and Version History:
 
+1.17.1    Release date:  14. June 2012
+        - Fixed a bug occuring when wayf_sp_samlDSURL contains GET arguments
+          Bug reported with a patch by Takeshi Nishimura from NII (Japan)
+        - Fixed typo in configuration otpion useImprovedDropDownList
 
-1.17    Release date:  18. Mai 2012
+1.17    Release date:  18. May 2012
         - Added CSS styles for mobile view
         - Embedded WAYF now reads 'entityID' and 'return' GET arguments.
           They get precedence over the values configured for the Embedded WAYF.
diff --git a/WAYF b/WAYF
index 9cce8262c8f3a76816017111a80fc54f7f01013b..83a8ffb78fe008582319c0ba80f3c5bdcbd29cd8 100755
--- a/WAYF
+++ b/WAYF
@@ -3,7 +3,7 @@
 /*
 ******************************************************************************
 SWITCHwayf
-Version: 1.17
+Version: 1.17.1
 Contact:  aai@switch.ch
 Web site: http://www.switch.ch/aai/wayf
 ******************************************************************************