diff --git a/GHUnitIOS.podspec b/GHUnitIOS.podspec
index 6a6859ad..3e47f2eb 100644
--- a/GHUnitIOS.podspec
+++ b/GHUnitIOS.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name     = 'GHUnitIOS'
-  s.version  = '0.5.7'
+  s.version  = '0.5.8'
   s.license  = 'MIT'
   s.summary  = 'Test Framework for Objective-C.'
   s.homepage = 'https://github.com/gh-unit/gh-unit'
   s.author   = { 'Gabriel Handford' => 'gabrielh@gmail.com' }
-  s.source   = { :git => 'https://github.com/gh-unit/gh-unit.git', :tag => '0.5.7'}
+  s.source   = { :git => 'https://github.com/gh-unit/gh-unit.git', :tag => s.version.to_s}
   s.description = 'GHUnit is a test framework for Objective-C, Mac OS X 10.5 and above and iPhone 3.x and above. It can be used standalone or with other testing frameworks like SenTestingKit or GTM.'
   s.source_files = 'Classes/**/*.{h,m}', 'Classes-iOS/**/*.{h,m}', 'Libraries/GTM/**/*.{h,m}'
   s.platform = :ios
diff --git a/GHUnitOSX.podspec b/GHUnitOSX.podspec
index 53a0e23c..a170b1a4 100644
--- a/GHUnitOSX.podspec
+++ b/GHUnitOSX.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name     = 'GHUnitOSX'
-  s.version  = '0.5.7'
+  s.version  = '0.5.8'
   s.license  = 'MIT'
   s.summary  = 'Test Framework for Objective-C.'
   s.homepage = 'https://github.com/gh-unit/gh-unit'
   s.author   = { 'Gabriel Handford' => 'gabrielh@gmail.com' }
-  s.source   = { :git => 'https://github.com/gh-unit/gh-unit.git', :tag => '0.5.7'}
+  s.source   = { :git => 'https://github.com/gh-unit/gh-unit.git', :tag => s.version.to_s}
   s.description = 'GHUnit is a test framework for Objective-C, Mac OS X 10.5 and above and iPhone 3.x and above. It can be used standalone or with other testing frameworks like SenTestingKit or GTM.'
   s.source_files = 'Classes/**/*.{h,m}', 'Classes-MacOSX/UI/*.{h,m}', 'Libraries/GTM/**/*.{h,m}'
   s.exclude_files    =  '**/*GHViewTestCase*'
diff --git a/XcodeConfig/Shared.xcconfig b/XcodeConfig/Shared.xcconfig
index 549c5d97..752c98b1 100644
--- a/XcodeConfig/Shared.xcconfig
+++ b/XcodeConfig/Shared.xcconfig
@@ -1,4 +1,4 @@
-GHUNIT_VERSION = 0.5.7
+GHUNIT_VERSION = 0.5.8
 
 GHUNIT_GENERAL_OTHER_CFLAGS = -Wdiv-by-zero -Wbad-function-cast -Wnested-externs -Wold-style-definition