diff --git a/software/phpbms/software.cfg b/software/phpbms/software.cfg
index e43cf40469e4c0e9b3d3d7c6ce0d3f6d8b4b2758..f083baf6f03a93f3832e0e584e6af21b1c3479d9 100644
--- a/software/phpbms/software.cfg
+++ b/software/phpbms/software.cfg
@@ -8,32 +8,49 @@ parts =
   eggs
   instance-recipe-egg
   downloadcache-workaround
-  
+  phpbms-patch
+  patch
+
 extends =
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
 
-allow-hosts += alastairs-place.net
+[phpbms-patch]
+recipe = slapos.recipe.download
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/8ee03078582ccc2410836ea90e30959d216480bc:/software/phpbms/phpbms_for_mysql5.patch
+md5sum = ddf323ac00e9e486cea8b8cc4277e065
+download-only = True
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = phpbms_for_mysql5.patch
 
 [application]
-recipe = hexagonit.recipe.download
-url = http://www.phpsources.org/zip_/phpbms-0.96.tar.gz
-#md5sum = Student may put here md5sum of this file, this is good idea
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
+recipe = slapos.recipe.build
+url = http://www.phpbms.org/files/phpbms/phpbms-0.98.tar.gz
+md5sum = 3907c5115cf9acaab7cb5d22ce0534b7
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}")
+
+[patch]
+recipe = iw.recipe.cmd
+on_install = true
+on_update = true
+cmds= patch -d ${application:location} -p1 < ${phpbms-patch:location}/${phpbms-patch:filename}
 
 [application-template]
 recipe = slapos.recipe.download
-url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/phpbms/template/settings.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/8ee03078582ccc2410836ea90e30959d216480bc:/software/phpbms/template/settings.php.in
+#md5sum = a60038aff02e4bf5049e9f55f16e8ed5
 download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
-location = phpbms/settings.php
-
+location = settings.php
+  
 [instance-recipe]
 egg = slapos.cookbook
 module = lamp.simple
@@ -49,12 +66,14 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]
 
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.31
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -67,4 +86,3 @@ download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
 stop-on-error = True
-