diff --git a/mm2mw.pl b/mm2mw.pl
index 07cbffb..cbf1c24 100755
--- a/mm2mw.pl
+++ b/mm2mw.pl
@@ -1295,9 +1295,7 @@ sub UploadAttachmentToServer { # Params: WikiURL,FilePath,MWName,Comment
 		Content =>
 			[
                  action        => 'query',
-                 prop        => 'info',
-                 intoken => 'edit',
-                 titles     => 'Main Page',
+                 meta => 'tokens',
                  format=>'xml'
 			]
 	);
@@ -1306,8 +1304,8 @@ sub UploadAttachmentToServer { # Params: WikiURL,FilePath,MWName,Comment
 
 	my $dom = XML::LibXML->load_xml(string => $response->{'_content'});
 #	print $dom->toStringHTML();
-	my $node = $dom->findnodes("//page")->get_node(1);
-	my $editToken = $node->getAttribute('edittoken');
+	my $node = $dom->findnodes("//tokens")->get_node(1);
+	my $editToken = $node->getAttribute('csrftoken');
 #	print "EditToken: ";
 #	print $editToken;
 #	print "\n";
@@ -1358,9 +1356,7 @@ sub UploadXmlToServer { # Params: WikiURL,XmlFilePath
 		Content =>
 			[
                  action        => 'query',
-                 prop        => 'info',
-                 intoken => 'import',
-                 titles     => 'Main Page',
+                 meta => 'tokens',
                  format=>'xml'
 			]
 	);
@@ -1369,8 +1365,8 @@ sub UploadXmlToServer { # Params: WikiURL,XmlFilePath
 
 	my $dom = XML::LibXML->load_xml(string => $response->{'_content'});
 #	print $dom->toStringHTML();
-	my $node = $dom->findnodes("//page")->get_node(1);
-	my $importToken = $node->getAttribute('importtoken');
+	my $node = $dom->findnodes("//tokens")->get_node(1);
+	my $importToken = $node->getAttribute('csrftoken');
 	print "ImportToken: ";
 	print $importToken;
 	print "\n";