diff --git a/lib/validates_as_uk_postcode.rb b/lib/validates_as_uk_postcode.rb
index 5513700..3aba8cd 100644
--- a/lib/validates_as_uk_postcode.rb
+++ b/lib/validates_as_uk_postcode.rb
@@ -1,13 +1,17 @@
 module ValidatesAsUKPostcode
   module Postcodes
-    UK = begin    
-      an_naa_or_ann_naa   = '^[A-PR-UWYZ]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
-      aan_naa_or_aann_naa = '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
-      ana_naa             = '^[A-PR-UWYZ]{1}\d[A-HJKSTUW]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
-      aana_naa            = '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d[ABEHMNPRVWXY]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$'
-      historic_code="GIR\s?0AA"
-      postcode_spec = "#{an_naa_or_ann_naa}|#{aan_naa_or_aann_naa}|#{ana_naa}|#{aana_naa}|#{historic_code}"
-      pattern = /#{postcode_spec}/i
+    UK = begin
+      patterns = {
+        :an_naa_or_ann_naa   => '^[A-PR-UWYZ]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
+        :aan_naa_or_aann_naa => '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d{1,2}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
+        :ana_naa             => '^[A-PR-UWYZ]{1}\d[A-HJKSTUW]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
+        :aana_naa            => '^[A-PR-UWYZ]{1}[A-HK-Y]{1}\d[ABEHMNPRVWXY]{1}\s?\d[ABD-HJLNP-UWXYZ]{2}$',
+        :historic_code       => '^(gir)(0aa)$',
+        :bfpo                => '^(bfpo)([0-9]{1,4})$',
+        :bfpo_co             => '^(bfpo)(c\/o[0-9]{1,3})$'
+      }
+      values = patterns.collect{|k,v| v}
+      pattern = /#{values.join "|"}/i
     end
   end
 end
diff --git a/test/rails2/validates_as_uk_postcode_test.rb b/test/rails2/validates_as_uk_postcode_test.rb
index d1be7ee..3efaefe 100644
--- a/test/rails2/validates_as_uk_postcode_test.rb
+++ b/test/rails2/validates_as_uk_postcode_test.rb
@@ -39,6 +39,8 @@ def test_invalid_postcodes
       'EC1O 1BB', 'EC1Q 1BB', 'EC1S 1BB', 'EC1T 1BB', 'EC1U 1BB', 'EC1Z 1BB', 'EC1A 1IB',
       'EC1A 1MB', 'EC1A 1OB', 'EC1A 1VB', 'EC1A 1BC', 'EC1A 1BI', 'EC1A 1BK', 'EC1A 1BM',
       'EC1A 1BO', 'EC1A 1BV',
+      
+      'BFPO 2789', 'BFPO c/o 2345'
       ]
     postcodes.each do |postcode|
       assert !AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be illegal."
@@ -58,6 +60,8 @@ def test_valid_postcodes
       'EC1A 1BB',
       'BT9 7JL',
       'GIR 0AA',
+      'BFPO 772',
+      'BFPO c/o 63'
       ]
     postcodes.each do |postcode|
       assert AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be legal."
diff --git a/test/rails3/validates_as_uk_postcode_test.rb b/test/rails3/validates_as_uk_postcode_test.rb
index d1be7ee..3efaefe 100644
--- a/test/rails3/validates_as_uk_postcode_test.rb
+++ b/test/rails3/validates_as_uk_postcode_test.rb
@@ -39,6 +39,8 @@ def test_invalid_postcodes
       'EC1O 1BB', 'EC1Q 1BB', 'EC1S 1BB', 'EC1T 1BB', 'EC1U 1BB', 'EC1Z 1BB', 'EC1A 1IB',
       'EC1A 1MB', 'EC1A 1OB', 'EC1A 1VB', 'EC1A 1BC', 'EC1A 1BI', 'EC1A 1BK', 'EC1A 1BM',
       'EC1A 1BO', 'EC1A 1BV',
+      
+      'BFPO 2789', 'BFPO c/o 2345'
       ]
     postcodes.each do |postcode|
       assert !AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be illegal."
@@ -58,6 +60,8 @@ def test_valid_postcodes
       'EC1A 1BB',
       'BT9 7JL',
       'GIR 0AA',
+      'BFPO 772',
+      'BFPO c/o 63'
       ]
     postcodes.each do |postcode|
       assert AbstractModel.new(:postcode => postcode).valid?, "#{postcode} should be legal."