diff --git a/pyfpdb/AlchemyMappings.py b/pyfpdb/AlchemyMappings.py
index c1110281..f71adc70 100644
--- a/pyfpdb/AlchemyMappings.py
+++ b/pyfpdb/AlchemyMappings.py
@@ -370,6 +370,7 @@ class Site(object):
             (10, 'Partouche',      'PA'),
             (11, 'Carbon',         'CA'),
             (12, 'PKR',            'PK'),
+            (13, 'PacificPoker',            'P8'),
         ]
     INITIAL_DATA_KEYS = ('id', 'name', 'code')
 
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 9812300b..f19a00c6 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1519,6 +1519,7 @@ class Database:
         c.execute("INSERT INTO Sites (name,code) VALUES ('Betfair', 'BF')")
         c.execute("INSERT INTO Sites (name,code) VALUES ('Absolute', 'AB')")
         c.execute("INSERT INTO Sites (name,code) VALUES ('PartyPoker', 'PP')")
+        c.execute("INSERT INTO Sites (name,code) VALUES ('PacificPoker', 'P8')")
         c.execute("INSERT INTO Sites (name,code) VALUES ('Partouche', 'PA')")
         c.execute("INSERT INTO Sites (name,code) VALUES ('Carbon', 'CA')")
         c.execute("INSERT INTO Sites (name,code) VALUES ('PKR', 'PK')")
diff --git a/pyfpdb/HUD_config.test.xml b/pyfpdb/HUD_config.test.xml
index f8a99ee3..dca95cd1 100644
--- a/pyfpdb/HUD_config.test.xml
+++ b/pyfpdb/HUD_config.test.xml
@@ -389,6 +389,49 @@ Left-Drag to Move"
             </layout>
         </site>
 
+        <site enabled="True"
+              site_name="PacificPoker"
+              table_finder="poker.exe"
+              screen_name="Hero"
+              site_path="C:/Games/Poker/PacificPoker"
+              HH_path="C:/Users/rwielinga/AppData/Roaming/PacificPoker/HandHistory/Hero/"
+              decoder="everleaf_decode_table"
+              converter="PacificPokerToFpdb"
+              supported_games="holdem">
+            <layout fav_seat="0" height="547" max="8" width="794">
+                <location seat="1" x="640" y="64">  </location>
+                <location seat="2" x="650" y="230"> </location>
+                <location seat="3" x="650" y="385"> </location>
+                <location seat="4" x="588" y="425"> </location>
+                <location seat="5" x="92" y="425"> </location>
+                <location seat="6" x="0" y="373"> </location>
+                <location seat="7" x="0" y="223"> </location>
+                <location seat="8" x="25" y="50">  </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="6" width="794">
+                <location seat="1" x="640" y="58"> </location>
+                <location seat="2" x="654" y="288"> </location>
+                <location seat="3" x="615" y="424"> </location>
+                <location seat="4" x="70" y="421"> </location>
+                <location seat="5" x="0" y="280"> </location>
+                <location seat="6" x="70" y="58"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="2" width="794">
+                <location seat="1" x="651" y="288"> </location>
+                <location seat="2" x="10"  y="288"> </location>
+            </layout>
+            <layout fav_seat="0" height="547" max="9" width="794">
+                <location seat="1" x="634" y="38">  </location>
+                <location seat="2" x="667" y="184"> </location>
+                <location seat="3" x="667" y="321"> </location>
+                <location seat="4" x="667" y="445"> </location>
+                <location seat="5" x="337" y="459"> </location>
+                <location seat="6" x="0" y="400"> </location>
+                <location seat="7" x="0" y="322"> </location>
+                <location seat="8" x="0" y="181">  </location>
+                <location seat="9" x="70" y="53">  </location>
+            </layout>
+        </site>
 
         <site enabled="True"
               site_name="Betfair"
@@ -754,6 +797,7 @@ Left-Drag to Move"
         <hhc site="Win2day" converter="Win2dayToFpdb"/>
         <hhc site="Absolute" converter="AbsoluteToFpdb"/>
         <hhc site="PartyPoker" converter="PartyPokerToFpdb"/>
+        <hhc site="PacificPoker" converter="PacificPokerToFpdb"/>
         <hhc site="Betfair" converter="BetfairToFpdb"/>
         <hhc site="OnGame" converter="OnGameToFpdb"/>
         <hhc site="Carbon" converter="CarbonToFpdb"/>
diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py
index e0988705..2690e70a 100644
--- a/pyfpdb/Options.py
+++ b/pyfpdb/Options.py
@@ -83,6 +83,7 @@ def site_alias(alias):
     """Function for converting various site aliases to the FPDB name"""
     tmp = alias
     aliases = {
+                "PacificPoker"   : "PacificPoker",
                 "PokerStars"     : "PokerStars",
                 "Full Tilt Poker": "Full Tilt Poker",
                 "PartyPoker"     : "PartyPoker",
diff --git a/pyfpdb/TestHandsPlayers.py b/pyfpdb/TestHandsPlayers.py
index 58d56ba1..9f63cb66 100644
--- a/pyfpdb/TestHandsPlayers.py
+++ b/pyfpdb/TestHandsPlayers.py
@@ -172,6 +172,8 @@ def compare(leaf, importer, errors, site):
     # Test if this is a hand history file
     if filename.endswith('.txt'):
         # test if there is a .hp version of the file
+        print "Site: %s" % site
+        print "Filename: %s" % filename
         importer.addBulkImportImportFileOrDir(filename, site=site)
         (stored, dups, partial, errs, ttime) = importer.runImport()
 
@@ -213,7 +215,7 @@ def usage():
     print "Run tests for a sinlge site:"
     print "\t./TestHandsPlayers -s <Sitename>"
     print "Run tests for a sinlge file in a site:"
-    print "\t./TestHandsPlayers -s <Sitename> -f <filname>"
+    print "\t./TestHandsPlayers -s <Sitename> -f <filename>"
     sys.exit(0)
 
 def main(argv=None):
@@ -255,6 +257,7 @@ def main(argv=None):
     importer.setCallHud(False)
     importer.setFakeCacheHHC(True)
 
+    PacificPokerErrors= FpdbError('PacificPoker')
     PokerStarsErrors  = FpdbError('PokerStars')
     FTPErrors         = FpdbError('Full Tilt Poker')
     PartyPokerErrors  = FpdbError('Party Poker')
@@ -271,7 +274,7 @@ def main(argv=None):
     WinamaxErrors     = FpdbError('Winamax')
 
     ErrorsList = [
-                    PokerStarsErrors, FTPErrors, PartyPokerErrors,
+                    PacificPokerErrors, PokerStarsErrors, FTPErrors, PartyPokerErrors,
                     BetfairErrors, OnGameErrors, AbsoluteErrors,
                     EverleafErrors, CarbonErrors, PKRErrors,
                     iPokerErrors, WinamaxErrors, UltimateBetErrors,
@@ -279,6 +282,7 @@ def main(argv=None):
                 ]
 
     sites = {
+                'PacificPoker' : False,
                 'PokerStars' : False,
                 'Full Tilt Poker' : False,
                 'PartyPoker' : False,
@@ -301,6 +305,11 @@ def main(argv=None):
     else:
         sites[options.sitename] = True
 
+    if sites['PacificPoker'] == True and not single_file_test:
+        walk_testfiles("regression-test-files/cash/PacificPoker/", compare, importer, PacificPokerErrors, "PacificPoker")
+    elif sites['PacificPoker'] == True and single_file_test:
+        walk_testfiles(options.filename, compare, importer, PacificPokerErrors, "PacificPoker")
+
     if sites['PokerStars'] == True and not single_file_test:
         walk_testfiles("regression-test-files/cash/Stars/", compare, importer, PokerStarsErrors, "PokerStars")
         walk_testfiles("regression-test-files/tour/Stars/", compare, importer, PokerStarsErrors, "PokerStars")
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00.txt.gz
new file mode 100644
index 00000000..bc6ccf32
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-1.00-2.00-stacks_over_1k.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-1.00-2.00-stacks_over_1k.txt.gz
new file mode 100644
index 00000000..b5b546d6
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-1.00-2.00-stacks_over_1k.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-USD-0.02-0.04.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-USD-0.02-0.04.txt.gz
new file mode 100644
index 00000000..32a46ca5
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-USD-0.02-0.04.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLO-PM-30-60.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLO-PM-30-60.txt.gz
new file mode 100644
index 00000000..031aba77
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLO-PM-30-60.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLOHL-PM-30-60.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLOHL-PM-30-60.txt.gz
new file mode 100644
index 00000000..ee4668dd
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLOHL-PM-30-60.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-LHE-USD-0.01-0.02.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-LHE-USD-0.01-0.02.txt.gz
new file mode 100644
index 00000000..23d61c3e
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-LHE-USD-0.01-0.02.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLH-USD-0.01-0.02.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLH-USD-0.01-0.02.txt.gz
new file mode 100644
index 00000000..c80698a3
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLH-USD-0.01-0.02.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-PM-1.00-2.00.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-PM-1.00-2.00.txt.gz
new file mode 100644
index 00000000..bd60ce1d
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-PM-1.00-2.00.txt.gz differ
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-USD-0.01-0.02.txt b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-USD-0.01-0.02.txt
new file mode 100644
index 00000000..4773ea94
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-NLHE-USD-0.01-0.02.txt
@@ -0,0 +1,48 @@
+#Game No : 172275663
+***** Cassava Hand History for Game 172275663 *****
+$0.01/$0.02 Blinds No Limit Holdem - *** 04 02 2011 11:27:06
+Table Huelva (Real Money)
+Seat 10 is the button
+Total number of players : 8
+Seat 1: Aussie_No.1 ( $2.58 )
+Seat 2: loffelj ( $4.14 )
+Seat 3: campdog14 ( $1.37 )
+Seat 5: Mendya. ( $2 )
+Seat 6: Borr_09 ( $0.22 )
+Seat 7: roughvan ( $1.23 )
+Seat 9: border360 ( $2.34 )
+Seat 10: guerrillero7 ( $1.97 )
+Aussie_No.1 posts small blind [$0.01]
+loffelj posts big blind [$0.02]
+campdog14 posts dead blind [$0.01 + $0.02]
+Mendya. posts dead blind [$0.01 + $0.02]
+** Dealing down cards **
+Dealt to Borr_09 [ Ad, 5c ]
+campdog14 checks
+Mendya. checks
+Borr_09 folds
+roughvan folds
+border360 folds
+guerrillero7 folds
+Aussie_No.1 calls [$0.01]
+loffelj checks
+** Dealing flop ** [ 4s, Ac, 7h ]
+Aussie_No.1 checks
+loffelj checks
+campdog14 checks
+Mendya. bets [$0.06]
+Aussie_No.1 folds
+loffelj folds
+campdog14 calls [$0.06]
+** Dealing turn ** [ 4h ]
+campdog14 checks
+Mendya. checks
+** Dealing river ** [ 4c ]
+campdog14 checks
+Mendya. bets [$0.15]
+campdog14 calls [$0.15]
+** Summary **
+Mendya. shows [ Kd, 7c ]
+campdog14 shows [ 7s, 5s ]
+campdog14 collected [ $0.24 ]
+Mendya. collected [ $1,024.24 ]
diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-PLH-PM-1.00-2.00.txt.gz b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-PLH-PM-1.00-2.00.txt.gz
new file mode 100644
index 00000000..44f31938
Binary files /dev/null and b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-PLH-PM-1.00-2.00.txt.gz differ