diff --git a/AUTHORS b/AUTHORS
index 2bd674929a..b7f8308b37 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -53,3 +53,5 @@ Joseph Lee <joseph.lee22590@gmail.com>
 Paul Wood <paulw.torchtrust@gmail.com>
 
 David Reynolds <dkreynolds@ntlworld.com>
+
+Knut Arne Bjørndal <bob+liblouis@cakebox.net>
diff --git a/ChangeLog b/ChangeLog
index fe7be3876a..02b5bb9b39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-28  Knut Arne Bjørndal <bob+liblouis@cakebox.net>
+
+	* tables/no-no-g0.utb: Fixes for Emphasis marks in the norwegian
+	braille table.
+
 2013-01-25  Christian Egli  <christian.egli@sbs.ch>
 
 	* tables/no-no-g0.utb: Corrections for double angle quotation
diff --git a/NEWS b/NEWS
index 804ec10fe8..e8209ebd70 100644
--- a/NEWS
+++ b/NEWS
@@ -13,8 +13,9 @@ liblouis NEWS -- history of user-visible changes.  	-*- org -*-
      Joseph Lee
    - Corrections to apostrophes in the Computer Spanish 8 dots Braille
      table (Es-Es-G0.utb). Thanks to Juan C. Buno.
-   - Corrections for double angle quotation marks in the Norwegian
-     Grade 0 Braille Table. Thanks to Knut Arne Bjørndal.
+   - Corrections for double angle quotation marks and emphasis marks
+     in the Norwegian Grade 0 Braille Table. Thanks to Knut Arne
+     Bjørndal.
 
 ** Bug Fixes
 
diff --git a/tables/no-no-g0.utb b/tables/no-no-g0.utb
index 64a46ccd36..96f81b5b8e 100644
--- a/tables/no-no-g0.utb
+++ b/tables/no-no-g0.utb
@@ -178,12 +178,22 @@ capsign 6							# single capital letter indicator
 begcaps 6-6						# a block of consecutive capital letters indicator
 endcaps 56
 
-begital 23
-begbold 23
-begunder 456
-endital 56
-endbold 56
-endunder 456
+lenitalphrase 1
+lenboldphrase 1
+
+firstwordital 23
+firstletterital 23
+firstwordbold 23
+firstletterbold 23
+firstwordunder 23
+firstletterunder 23
+
+lastworditalafter 56
+lastletterital 56
+lastwordboldafter 56
+lastletterbold 56
+lastwordunderafter 56
+lastletterunder 56
 
 midnum , 2
 midnum . 3