diff --git a/source/pdo_sqlsrv/template.rc b/source/pdo_sqlsrv/template.rc
index d36cd82f..285762db 100644
--- a/source/pdo_sqlsrv/template.rc
+++ b/source/pdo_sqlsrv/template.rc
@@ -43,8 +43,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 //Version
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE, SQLVERSION_BUILD
- PRODUCTVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_RELEASE,0
+ FILEVERSION  SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH, SQLVERSION_BUILD
+ PRODUCTVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -62,12 +62,12 @@ BEGIN
             VALUE "Comments", "This product includes PHP software that is freely available from http://www.php.net/software/.  Copyright © 2001-2016 The PHP Group.  All rights reserved.\0"
             VALUE "CompanyName", "Microsoft Corp.\0"
             VALUE "FileDescription", "Microsoft Drivers for PHP for SQL Server (PDO Driver)\0"
-            VALUE "FileVersion", STRVER4(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE, SQLVERSION_BUILD)
+            VALUE "FileVersion", STRVER4(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH, SQLVERSION_BUILD)
             VALUE "InternalName", FILE_NAME "\0"
             VALUE "LegalCopyright", "Copyright Microsoft Corporation.\0"
             VALUE "OriginalFilename", FILE_NAME "\0"
             VALUE "ProductName", "Microsoft Drivers for PHP for SQL Server\0"
-            VALUE "ProductVersion", STRVER3(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE)
+            VALUE "ProductVersion", STRVER3(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH)
             VALUE "URL", "http://www.microsoft.com\0"
        END
     END
diff --git a/source/shared/version.h b/source/shared/version.h
index c6c5a0c9..604ed9f4 100644
--- a/source/shared/version.h
+++ b/source/shared/version.h
@@ -24,13 +24,24 @@
 
 #define SQLVERSION_MAJOR 4
 #define SQLVERSION_MINOR 1
-#define SQLVERSION_RELEASE 6
+#define SQLVERSION_PATCH 7
 #define SQLVERSION_BUILD 0
 
-#define VER_FILEVERSION_STR     STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_RELEASE ) "." STRINGIFY( SQLVERSION_BUILD ) 
-#define _FILEVERSION            SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_RELEASE,SQLVERSION_BUILD
-#define PHP_SQLSRV_VERSION      STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_RELEASE )
-#define PHP_PDO_SQLSRV_VERSION  PHP_SQLSRV_VERSION
+// Semantic versioning pre-release and buil metadata
+#define SEMVER_PRERELEASE "-preview"
+#define SEMVER_BUILDMETA
+
+#if SQLVERSION_BUILD > 0
+#undef SEMVER_BUILDMETA
+#define SEMVER_BUILDMETA "+" STRINGIFY( SQLVERSION_BUILD )
+#endif
+
+#define VER_FILEVERSION_STR     STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH ) SEMVER_PRERELEASE SEMVER_BUILDMETA
+#define _FILEVERSION            SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD
+
+//PECL extension verison macros
+#define PHP_SQLSRV_VERSION      VER_FILEVERSION_STR
+#define PHP_PDO_SQLSRV_VERSION  VER_FILEVERSION_STR
 
 #endif // VERSION_H
 
diff --git a/source/sqlsrv/template.rc b/source/sqlsrv/template.rc
index 5d148c59..0e20602d 100644
--- a/source/sqlsrv/template.rc
+++ b/source/sqlsrv/template.rc
@@ -43,8 +43,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 //Version
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE, SQLVERSION_BUILD
- PRODUCTVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_RELEASE,0
+ FILEVERSION  SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH, SQLVERSION_BUILD
+ PRODUCTVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -62,12 +62,12 @@ BEGIN
             VALUE "Comments", "This product includes PHP software that is freely available from http://www.php.net/software/.  Copyright © 2001-2016 The PHP Group.  All rights reserved.\0"
             VALUE "CompanyName", "Microsoft Corp.\0"
             VALUE "FileDescription", "Microsoft Drivers for PHP for SQL Server\0"
-            VALUE "FileVersion", STRVER4(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE, SQLVERSION_BUILD)
+            VALUE "FileVersion", STRVER4(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH, SQLVERSION_BUILD)
             VALUE "InternalName", FILE_NAME "\0"
             VALUE "LegalCopyright", "Copyright Microsoft Corporation.\0"
             VALUE "OriginalFilename", FILE_NAME "\0"
             VALUE "ProductName", "Microsoft Drivers for PHP for SQL Server\0"
-            VALUE "ProductVersion", STRVER3(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_RELEASE)
+            VALUE "ProductVersion", STRVER3(SQLVERSION_MAJOR,SQLVERSION_MINOR, SQLVERSION_PATCH)
             VALUE "URL", "http://www.microsoft.com\0"
        END
     END
diff --git a/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
new file mode 100644
index 00000000..f85a0e35
--- /dev/null
+++ b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test client info by calling PDO::getAttribute with PDO::ATTR_CLIENT_VERSION 
+--FILE--
+<?php
+require_once("autonomous_setup.php");
+
+$conn = new PDO( "sqlsrv:server=$serverName", "$username", "$password" );
+
+// An example using PDO::ATTR_CLIENT_VERSION
+print_r($conn->getAttribute( PDO::ATTR_CLIENT_VERSION ));
+
+//free the connection
+$conn=null;
+?>
+--EXPECTREGEX--
+Array
+\(
+    \[(DriverDllName|DriverName)\] => (msodbcsql1[1-9].dll|libmsodbcsql-[1-9]{2}.[0-9].so.[0-9].[0-9])
+    \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
+    \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
+    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?
+\)
\ No newline at end of file
diff --git a/test/sqlsrv/sqlsrv_client_info.phpt b/test/sqlsrv/sqlsrv_client_info.phpt
new file mode 100644
index 00000000..9fad7661
--- /dev/null
+++ b/test/sqlsrv/sqlsrv_client_info.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Test sqlsrv_client_info
+--SKIPIF--
+--FILE--
+<?php
+require_once("autonomous_setup.php");
+$conn = sqlsrv_connect( $serverName, $connectionInfo);
+if( !$conn ) { 
+	die( print_r( sqlsrv_errors(), true)); 
+}
+
+$client_info = sqlsrv_client_info( $conn );
+var_dump( $client_info );
+?>
+--EXPECTREGEX--
+array\(4\) {
+  \[\"(DriverDllName|DriverName)\"\]=>
+  (string\(15\) \"msodbcsql1[1-9].dll\"|string\(24\) \"libmsodbcsql-[1-9]{2}.[0-9].so.[0-9].[0-9]\")
+  \[\"DriverODBCVer\"\]=>
+  string\(5\) \"[0-9]{1,2}\.[0-9]{1,2}\"
+  \[\"DriverVer\"\]=>
+  string\(10\) \"[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}\"
+  \[\"ExtensionVer\"\]=>
+  string\([0-9]+\) \"[0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?"
+}
\ No newline at end of file