diff --git a/src/client.c b/src/client.c
index 563a725803667b314e56d4ebbecf4a142bc2a82e..228f3df2054cae84b644898fbb5d8e06ff107495 100644
--- a/src/client.c
+++ b/src/client.c
@@ -34,7 +34,7 @@
 int main(int argc, char **argv)
 {
     struct soap *soap = soap_new();
-    char *url, *inep, *macAddr, *basedir, *clientVersion, *versionFromServer;
+    char *url, *inep, *macAddr, *basedir, *clientVersion;
     int arglen, len;
 
     /* Initialization *
@@ -91,25 +91,7 @@ int main(int argc, char **argv)
     /* End of Initialization
      *-----------------------------------------------------------------------
      * Agent Version method */
-    if (soap_call_ns1__getAgentVersion(soap, url, "", &versionFromServer) !=
-        SOAP_OK)
-    {
-        soap_print_fault(soap, stderr);
-        exit(2);
-    }
-
-    if (DEBUG)
-    {
-        printf("Version from server: %s\n",versionFromServer);
-    }
-
-    /* Compare client and server versions */
-    if (strcmp(clientVersion, versionFromServer) != 0)
-    {
-        fprintf(stderr, "Client version out-of-date. Update client.\n");
-        /* Client out-of-date version */
-        exit(4);
-    }
+     check_version(soap, url, clientVersion);
     /* End of Agent Version method
      *------------------------------------------------------------------------
      * Availability method */