diff --git a/types/hapi-pino/hapi-pino-tests.ts b/types/hapi-pino/hapi-pino-tests.ts
index eb028d37ad..7faa159273 100644
--- a/types/hapi-pino/hapi-pino-tests.ts
+++ b/types/hapi-pino/hapi-pino-tests.ts
@@ -1,4 +1,4 @@
-import { Server } from 'hapi';
+import { Server } from '@hapi/hapi';
 import * as pino from 'pino';
 import * as HapiPino from 'hapi-pino';
 
diff --git a/types/hapi-pino/index.d.ts b/types/hapi-pino/index.d.ts
index c3f61cbe8d..7afbcafed4 100644
--- a/types/hapi-pino/index.d.ts
+++ b/types/hapi-pino/index.d.ts
@@ -1,24 +1,24 @@
-// Type definitions for hapi-pino 5.2
+// Type definitions for hapi-pino 6.0
 // Project: https://github.com/pinojs/hapi-pino#readme
 // Definitions by: Rodrigo Saboya <https://github.com/saboya>
+//                 Todd Bealmear <https://github.com/todd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 /// <reference types='node' />
 
-import {
-    Plugin,
-} from 'hapi';
 import * as pino from 'pino';
 
-declare module 'hapi' {
-interface Server {
-    logger: () => pino.Logger;
-}
+import { Plugin } from '@hapi/hapi';
 
-interface Request {
-    logger: pino.Logger;
-}
+declare module '@hapi/hapi' {
+    interface Server {
+        logger: () => pino.Logger;
+    }
+
+    interface Request {
+        logger: pino.Logger;
+    }
 }
 
 declare namespace HapiPino {
diff --git a/types/hapi-pino/tsconfig.json b/types/hapi-pino/tsconfig.json
index 044a1596b4..4e1a2bc92b 100644
--- a/types/hapi-pino/tsconfig.json
+++ b/types/hapi-pino/tsconfig.json
@@ -14,7 +14,33 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@hapi/hapi": [
+                "hapi__hapi"
+            ],
+            "@hapi/boom": [
+                "hapi__boom"
+            ],
+            "@hapi/shot": [
+                "hapi__shot"
+            ],
+            "@hapi/mimos": [
+                "hapi__mimos"
+            ],
+            "@hapi/iron": [
+                "hapi__iron"
+            ],
+            "@hapi/joi": [
+                "hapi__joi"
+            ],
+            "@hapi/podium": [
+                "hapi__podium"
+            ],
+            "@hapi/catbox": [
+                "hapi__catbox"
+            ]
+        }
     },
     "files": [
         "index.d.ts",