diff --git a/lib/Sabberworm/CSS/RuleSet/AtRule.php b/lib/Sabberworm/CSS/CSSList/AtRule.php
similarity index 85%
rename from lib/Sabberworm/CSS/RuleSet/AtRule.php
rename to lib/Sabberworm/CSS/CSSList/AtRule.php
index 1287ebbc6..6133c91f9 100644
--- a/lib/Sabberworm/CSS/RuleSet/AtRule.php
+++ b/lib/Sabberworm/CSS/CSSList/AtRule.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sabberworm\CSS\RuleSet;
+namespace Sabberworm\CSS\CSSList;
 
 /**
  * A RuleSet constructed by an unknown @-rule. @font-face rules are rendered into AtRule objects.
  */
-class AtRule extends RuleSet {
+class AtRule extends CSSBlockList {
 
 	private $sType;
 
@@ -25,4 +25,4 @@ public function __toString() {
 		return $sResult;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/lib/Sabberworm/CSS/Parser.php b/lib/Sabberworm/CSS/Parser.php
index 5a55ba2f7..b4c0630f9 100644
--- a/lib/Sabberworm/CSS/Parser.php
+++ b/lib/Sabberworm/CSS/Parser.php
@@ -2,6 +2,7 @@
 
 namespace Sabberworm\CSS;
 
+use Sabberworm\CSS\CSSList\AtRule;
 use Sabberworm\CSS\CSSList\CSSList;
 use Sabberworm\CSS\CSSList\Document;
 use Sabberworm\CSS\CSSList\MediaQuery;
@@ -9,7 +10,6 @@
 use Sabberworm\CSS\Property\Import;
 use Sabberworm\CSS\Property\Charset;
 use Sabberworm\CSS\Property\CSSNamespace;
-use Sabberworm\CSS\RuleSet\AtRule;
 use Sabberworm\CSS\RuleSet\DeclarationBlock;
 use Sabberworm\CSS\Value\CSSFunction;
 use Sabberworm\CSS\Value\RuleValueList;
@@ -133,10 +133,11 @@ private function parseAtRule() {
 			return new CSSNamespace($mUrl, $sPrefix);
 		} else {
 			//Unknown other at rule (font-face or such)
+			$sIdentifier .= rtrim(' ' . $this->consumeUntil('{'));
 			$this->consume('{');
 			$this->consumeWhiteSpace();
 			$oAtRule = new AtRule($sIdentifier);
-			$this->parseRuleSet($oAtRule);
+			$this->parseList($oAtRule);
 			return $oAtRule;
 		}
 	}