diff --git a/src/completion.ts b/src/completion.ts
new file mode 100644
index 0000000..21a3ae5
--- /dev/null
+++ b/src/completion.ts
@@ -0,0 +1,20 @@
+/**
+ * completion.ts
+ * 
+ * @author CismonX <admin@cismon.net>
+ * @license MIT
+ */
+
+import * as vscode from 'vscode';
+
+export class CompletionItemProvider implements vscode.CompletionItemProvider {
+
+    provideCompletionItems(
+        document: vscode.TextDocument,
+        position: vscode.Position,
+        token: vscode.CancellationToken,
+        context: vscode.CompletionContext
+    ) {
+        return <vscode.CompletionItem[]>[];
+    }
+}
diff --git a/src/extension.ts b/src/extension.ts
index 5593080..1b7969d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -8,12 +8,15 @@
 import * as vscode from 'vscode';
 import { Options } from './options';
 import { Preview } from './preview';
+import { CompletionItemProvider } from './completion';
 
 export function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
         vscode.workspace.onDidSaveTextDocument(Preview.update),
         vscode.workspace.onDidCloseTextDocument(Preview.close),
-        vscode.commands.registerTextEditorCommand('texinfo.showPreview', Preview.show));
+        vscode.commands.registerTextEditorCommand('texinfo.showPreview', Preview.show),
+        vscode.languages.registerCompletionItemProvider('texinfo', new CompletionItemProvider(), '@'),
+    );
 }
 
 export function deactivate() {
diff --git a/src/options.ts b/src/options.ts
index ee42124..2520918 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -10,7 +10,7 @@ import * as vscode from 'vscode';
 let options: Options | undefined;
 
 /**
- * Get extension options.
+ * Fetch extension option values.
  * 
  * See `contributes.configuration` of package.json for details.
  */