diff --git a/setup.cfg b/setup.cfg
index b0651e8..55f0447 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,20 +1,16 @@
 [metadata]
 name = %%name%%
 version = %%version%%
-summary = %%description%%
-description-file =
-    README.rst
-    CHANGELOG.rst
+description = %%description%%
+long_description = file: README.rst, CHANGELOG.rst
 license_file = LICENSE
-requires-dist =
-    pyyaml
 
 ## sdist info
 author = %%author%%
 author_email = %%email%%
-home_page = http://github.com/0k/%%name%%
+url = http://github.com/0k/%%name%%
 license = BSD 3-Clause License
-classifier =
+classifiers =
     Programming Language :: Python
     Environment :: Console
     Intended Audience :: Developers
@@ -32,34 +28,22 @@ classifier =
     Programming Language :: Python :: 3.7
 
 
-[backwards_compat]
+[options]
 ## without this ``pip uninstall`` fails on recent version of setuptools
 ## (tested failing with setuptools 34.3.3, working with setuptools 9.1)
-zip-safe = False
-
+zip_safe = False
+install_requires =
+    pyyaml
 
 [bdist_wheel]
 universal = 1
 
-
-[files]
-extra_files =
-    README.rst
-    CHANGELOG.rst
-    setup.py
-## Note: d2to1 maps ``setup.py``'s ``py_modules`` to ``modules`` here.
-## This is required for single-file module, this allows the ``entry_point``
-## to reference ``shyaml``. Besides, this is needed also for direct python
-## API usage.
-modules =
-    shyaml
-
 ## We can't use scripts to share these simply as extension managed ``.py``
 ## is not correctly handled for both windows and linux to be happy.
 # scripts =
 #     shyaml
 
-[entry_points]
+[options.entry_points]
 console_scripts =
     ## will generate correct files with adequate extenstion in windows
     ## and linux, contrary to 'scripts'. Note that it requires 'shyaml'
diff --git a/setup.py b/setup.py
index b4a517e..6089fcc 100644
--- a/setup.py
+++ b/setup.py
@@ -54,9 +54,7 @@
 ##
 
 setup(
-    setup_requires=['d2to1'],
     extras_require={'test': [
         "docshtest==0.0.3",
         ]},
-    d2to1=True
 )