diff --git a/src/org/rascalmpl/library/lang/std/Layout.rsc b/src/org/rascalmpl/library/lang/std/Layout.rsc
index 6ba48a98c04..959929b4772 100644
--- a/src/org/rascalmpl/library/lang/std/Layout.rsc
+++ b/src/org/rascalmpl/library/lang/std/Layout.rsc
@@ -1,5 +1,5 @@
 @license{
-  Copyright (c) 2009-2011 CWI
+  Copyright (c) 2009-2013 CWI
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@ extend lang::std::Whitespace;
 extend lang::std::Comment;
  
 layout Standard 
-  = WhitespaceOrComment* !>> [\ \t\n\f\r] !>> "//";
+  = WhitespaceOrComment* !>> [\u0009-\u000D \u0020 \u0085 \u00A0 \u1680 \u180E \u2000-\u200A \u2028 \u2029 \u202F \u205F \u3000] !>> "//";
   
 syntax WhitespaceOrComment 
   = whitespace: Whitespace