diff --git a/files/index.php b/files/index.php
index 059546391b6287a40682a2ca831c9160d9ad1435..3d62c3385faf60c64ea8e20dde8be3f82cd41544 100644
--- a/files/index.php
+++ b/files/index.php
@@ -47,8 +47,14 @@ $files = array();
 foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 	$i["date"] = OC_Util::formatDate($i["mtime"] );
 	if($i['type']=='file'){
-		$i['extention']=substr($i['name'],strrpos($i['name'],'.'));
-		$i['basename']=substr($i['name'],0,strrpos($i['name'],'.'));
+		$fileinfo=pathinfo($i['name']);
+		$i['basename']=$fileinfo['filename'];
+		if (!empty($fileinfo['extension'])) {
+			$i['extention']='.' . $fileinfo['extension'];
+		}
+		else {
+			$i['extention']='';
+		}
 	}
 	if($i['directory']=='/'){
 		$i['directory']='';