Index: incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x
===================================================================
--- incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 77742)
+++ incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 77743)
@@ -25,7 +25,7 @@
       <attr-item tags="nom"/>
       <attr-item tags="gen"/>
     </def-attr>
-    <def-attr n="a_num">
+    <def-attr n="num">
       <attr-item tags="sg"/>
       <attr-item tags="pl"/>
     </def-attr>
@@ -32,10 +32,6 @@
     <def-attr n="v_mood">
       <attr-item tags="ind"/>
     </def-attr>
-    <def-attr n="v_num">
-      <attr-item tags="sg"/>
-      <attr-item tags="pl"/>
-    </def-attr>
   </section-def-attrs>
 
   <section-def-vars>
@@ -54,12 +50,17 @@
     
     <def-macro n="rm_case_and_num" npar="1">
       <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
-      <let><clip pos="1" side="tl" part="a_num"/><lit v=""/></let>
+      <let><clip pos="1" side="tl" part="num"/><lit v=""/></let>
     </def-macro>
     
     <def-macro n="rm_case" npar="1">
       <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
     </def-macro>
+    
+    
+    <def-macro n="rm_v_num" npar="1">
+      <let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
+    </def-macro>
 
   	<def-macro n="rm_stuff" npar="1">
       <choose>
@@ -67,11 +68,7 @@
               <let><clip pos="1" side="tl" part="v_mood"/><lit v=""/></let>
         </when>
       </choose>
-      <choose>
-        <when><test><equal><clip pos="1" side="sl" part="v_num"/><lit-tag v="pl"/></equal></test>
-              <let><clip pos="1" side="tl" part="v_num"/><lit v=""/></let>
-        </when>
-      </choose>
+      <let><clip pos="1" side="tl" part="num"/><lit v=""/></let>
     </def-macro>
   </section-def-macros>