diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 4d14cc1a24..a0b2ee2e0c 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -467,6 +467,12 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 			for(u32 i=0; i<c; i++)
 			{
 				scene::IMeshBuffer *buf = mesh->getMeshBuffer(i);
+
+				//AA + Trilinear
+				buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
+				buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, true);
+                                buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, true);
+
 				const video::SMaterial& material = buf->getMaterial();
 				video::IMaterialRenderer* rnd =
 						driver->getMaterialRenderer(material.MaterialType);
diff --git a/src/main.cpp b/src/main.cpp
index 6075e9d100..63918a60d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1293,7 +1293,7 @@ int main(int argc, char *argv[])
 	video::IVideoDriver* driver = device->getVideoDriver();
 
 	// Disable mipmaps (because some of them look ugly)
-	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
+	driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, true);
 
 	/*
 		This changes the minimum allowed number of vertices in a VBO.