diff --git a/filefield.token.inc b/filefield.token.inc
index b2e4b7020586165d7ace0d762bf2782fa1f6f6f9..2b889c8719c0056642a626531ad7321e939e6833 100644
--- a/filefield.token.inc
+++ b/filefield.token.inc
@@ -58,7 +58,7 @@ function filefield_token_values($type, $object = NULL) {
     }
     if (!isset($tokens['filefield-extension'])) {
       $info = pathinfo($item['filename']);
-      $tokens['filefield-onlyname'] = $info['filename'];
+      $tokens['filefield-onlyname'] = basename($info['basename'], '.'. $info['extension']);
       $tokens['filefield-extension'] = $info['extension'];
     }
   }