diff --git a/php/composer.sls b/php/composer.sls
index e1a0ec3..bc9f999 100644
--- a/php/composer.sls
+++ b/php/composer.sls
@@ -32,7 +32,7 @@ install-composer:
     - require:
       - file: get-composer
 
-# Get COMPOSER_DEV_WARNING_TIME from the installed composer, and if that time has passed
+# Get composer version date and check if older than 60day (defaultvalue of COMPOSER_DEV_WARNING_TIME)
 # then it's time to run `composer selfupdate`
 #
 # It would be nice if composer had a command line switch to get this, but it doesn't,
@@ -41,7 +41,7 @@ install-composer:
 update-composer:
   cmd.run:
     - name: "{{ install_file }} selfupdate"
-    - unless: test $(grep --text COMPOSER_DEV_WARNING_TIME {{ install_file }} | egrep '^\s*define' | sed -e 's,[^[:digit:]],,g') \> $(php -r 'echo time();')
+    - unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") \> $(date "+%s")
     - cwd: {{ php.local_bin }}
     - env:
       - HOME: {{ salt_user_home }}
diff --git a/php/ng/composer.sls b/php/ng/composer.sls
index 6952b1d..39e61e7 100644
--- a/php/ng/composer.sls
+++ b/php/ng/composer.sls
@@ -32,7 +32,7 @@ install-composer:
     - require:
       - file: get-composer
 
-# Get COMPOSER_DEV_WARNING_TIME from the installed composer, and if that time has passed
+# Get composer version date and check if older than 60day (defaultvalue of COMPOSER_DEV_WARNING_TIME)
 # then it's time to run `composer selfupdate`
 #
 # It would be nice if composer had a command line switch to get this, but it doesn't,
@@ -41,7 +41,7 @@ install-composer:
 update-composer:
   cmd.run:
     - name: "{{ install_file }} selfupdate"
-    - unless: test $(grep --text COMPOSER_DEV_WARNING_TIME {{ install_file }} | egrep '^\s*define' | sed -e 's,[^[:digit:]],,g') \> $(php -r 'echo time();')
+    - unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") \> $(date "+%s")
     - cwd: {{ php.lookup.pkgs.local_bin }}
     - env:
       - HOME: {{ salt_user_home }}